Skip to content

Commit 723f34f

Browse files
h-eastchrisbra
h-east
authored and
chrisbra
committed
patch 9.1.1832: if_perl: contains references to legacy if_perlsfio
Problem: if_perl: contains references to legacy if_perlsfio.{c,pro} and USE_SFIO Solution: Remove those references (Hirohito Higashi) fixes: #18496 closes: #18500 Signed-off-by: Hirohito Higashi <[email protected]> Signed-off-by: Christian Brabandt <[email protected]>
1 parent 8824526 commit 723f34f

File tree

13 files changed

+22
-116
lines changed

13 files changed

+22
-116
lines changed

‎.github/labeler.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ if_perl:
4545
- changed-files:
4646
- any-glob-to-any-file:
4747
- 'src/if_perl.xs'
48-
- 'src/if_perlsfio.c'
4948
- 'src/proto/if_perl.pro'
50-
- 'src/proto/if_perlsfio.pro'
5149
- 'runtime/doc/if_perl.txt'
5250

5351
if_python:

‎Filelist‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,6 @@ SRC_DOS_UNIX = \
550550
src/if_mzsch.c \
551551
src/if_mzsch.h \
552552
src/if_perl.xs \
553-
src/if_perlsfio.c \
554553
src/if_python.c \
555554
src/if_python3.c \
556555
src/if_py_both.h \
@@ -561,7 +560,6 @@ SRC_DOS_UNIX = \
561560
src/proto/if_lua.pro \
562561
src/proto/if_mzsch.pro \
563562
src/proto/if_perl.pro \
564-
src/proto/if_perlsfio.pro \
565563
src/proto/if_python.pro \
566564
src/proto/if_python3.pro \
567565
src/proto/if_ruby.pro \

‎src/INSTALLvms.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ from CVS mirror ftp://ftp.polarhome.com/pub/cvs/SOURCE/
294294
7.1.3 feature_OBJ = code1.obj code2.obj
295295

296296
Lists objects created from source codes listed in feature_SRC
297-
Example: PERL_OBJ = if_perlsfio.obj if_perl.obj
297+
Example: PERL_OBJ = if_perl.obj
298298

299299
7.1.4 feature_LIB = ,OS_VMS_TCL.OPT/OPT
300300

‎src/Make_mvc.mak‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,7 +1129,7 @@ CFLAGS = $(CFLAGS) -DDYNAMIC_PERL -DDYNAMIC_PERL_DLL=\"$(PERL_DLL)\"
11291129

11301130
PERL_EXE = $(PERL)\Bin$(PERL_ARCH)\perl
11311131
PERL_INC = /I $(PERL_INCDIR)
1132-
PERL_OBJ = $(OUTDIR)\if_perl.obj $(OUTDIR)\if_perlsfio.obj
1132+
PERL_OBJ = $(OUTDIR)\if_perl.obj
11331133
XSUBPP = $(PERL)\lib\ExtUtils\xsubpp
11341134
! IF exist($(XSUBPP))
11351135
XSUBPP = $(PERL_EXE) $(XSUBPP)
@@ -1647,9 +1647,6 @@ auto/if_perl.c: if_perl.xs typemap
16471647
$(OUTDIR)/if_perl.obj: $(OUTDIR) auto/if_perl.c $(INCL)
16481648
$(CC) $(CFLAGS_OUTDIR) $(PERL_INC) auto/if_perl.c
16491649

1650-
$(OUTDIR)/if_perlsfio.obj: $(OUTDIR) if_perlsfio.c $(INCL)
1651-
$(CC) $(CFLAGS_OUTDIR) $(PERL_INC) if_perlsfio.c
1652-
16531650
$(OUTDIR)/if_mzsch.obj: $(OUTDIR) if_mzsch.c $(MZSCHEME_INCL) $(INCL) \
16541651
$(MZSCHEME_EXTRA_DEP)
16551652
$(CC) $(CFLAGS_OUTDIR) if_mzsch.c \

‎src/Make_vms.mms‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -359,9 +359,8 @@ LIBS =
359359
# Perl related setup.
360360
PERL = perl
361361
PERL_DEF = ,"FEAT_PERL"
362-
PERL_SRC = if_perlsfio.c if_perl.xs
362+
PERL_SRC = if_perl.xs
363363
PERL_OBJ = \
364-
[.$(DEST)]if_perlsfio.obj \
365364
[.$(DEST)]if_perl.obj
366365

367366
PERL_LIB = ,OS_VMS_PERL.OPT/OPT
@@ -1506,10 +1505,6 @@ lua_env :
15061505
ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
15071506
gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
15081507
errors.h globals.h
1509-
[.$(DEST)]if_perlsfio.obj : if_perlsfio.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
1510-
ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
1511-
gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
1512-
errors.h globals.h
15131508
[.$(DEST)]if_python.obj : if_python.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
15141509
ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
15151510
gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \

‎src/Makefile‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1620,7 +1620,7 @@ SRC = $(BASIC_SRC) \
16201620
$(RUBY_SRC) \
16211621
$(WAYLAND_SRC)
16221622

1623-
EXTRA_SRC = if_lua.c if_mzsch.c auto/if_perl.c if_perlsfio.c \
1623+
EXTRA_SRC = if_lua.c if_mzsch.c auto/if_perl.c \
16241624
if_python.c if_python3.c if_tcl.c if_ruby.c \
16251625
gui_beval.c netbeans.c job.c channel.c \
16261626
$(GRESOURCE_SRC)
@@ -3397,9 +3397,6 @@ mzscheme_base.c:
33973397
objects/if_perl.o: auto/if_perl.c
33983398
$(CCC_NF) $(PERL_CFLAGS) $(ALL_CFLAGS) $(PERL_CFLAGS_EXTRA) -o $@ auto/if_perl.c
33993399

3400-
objects/if_perlsfio.o: if_perlsfio.c
3401-
$(CCC_NF) $(PERL_CFLAGS) $(ALL_CFLAGS) $(PERL_CFLAGS_EXTRA) -o $@ if_perlsfio.c
3402-
34033400
objects/if_python.o: if_python.c if_py_both.h
34043401
$(CCC_NF) $(PYTHON_CFLAGS) $(ALL_CFLAGS) $(PYTHON_CFLAGS_EXTRA) -o $@ if_python.c
34053402

@@ -4513,11 +4510,6 @@ objects/if_perl.o: auto/if_perl.c vim.h protodef.h auto/config.h feature.h \
45134510
beval.h proto/gui_beval.pro structs.h regexp.h gui.h \
45144511
libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \
45154512
ex_cmds.h spell.h proto.h globals.h errors.h
4516-
objects/if_perlsfio.o: if_perlsfio.c vim.h protodef.h auto/config.h feature.h \
4517-
os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \
4518-
beval.h proto/gui_beval.pro structs.h regexp.h gui.h \
4519-
libvterm/include/vterm.h libvterm/include/vterm_keycodes.h alloc.h \
4520-
ex_cmds.h spell.h proto.h globals.h errors.h
45214513
objects/if_python.o: if_python.c vim.h protodef.h auto/config.h feature.h \
45224514
os_unix.h auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h \
45234515
beval.h proto/gui_beval.pro structs.h regexp.h gui.h \

‎src/auto/configure‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6967,9 +6967,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
69676967
fi
69686968
fi
69696969
PERL_LIBS=$perllibs
6970-
PERL_SRC="auto/if_perl.c if_perlsfio.c"
6971-
PERL_OBJ="objects/if_perl.o objects/if_perlsfio.o"
6972-
PERL_PRO="if_perl.pro if_perlsfio.pro"
6970+
PERL_SRC="auto/if_perl.c"
6971+
PERL_OBJ="objects/if_perl.o"
6972+
PERL_PRO="if_perl.pro"
69736973
printf "%s\n" "#define FEAT_PERL 1" >>confdefs.h
69746974

69756975
fi
@@ -6995,7 +6995,7 @@ printf "%s\n" ">>> too old; need Perl version 5.003_01 or later <<<" >&6; }
69956995
if test -n "$PERL"; then
69966996
PERL_DIR="$dir"
69976997
PERL_CFLAGS="-DFEAT_PERL -I$darwindir/CORE"
6998-
PERL_OBJ="objects/if_perl.o objects/if_perlsfio.o $darwindir/auto/DynaLoader/DynaLoader.a"
6998+
PERL_OBJ="objects/if_perl.o $darwindir/auto/DynaLoader/DynaLoader.a"
69996999
PERL_LIBS="-L$darwindir/CORE -lperl"
70007000
fi
70017001
PERL_LIBS=`echo "$PERL_LIBS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'`

‎src/configure.ac‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1246,9 +1246,9 @@ if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then
12461246
fi
12471247
fi
12481248
PERL_LIBS=$perllibs
1249-
PERL_SRC="auto/if_perl.c if_perlsfio.c"
1250-
PERL_OBJ="objects/if_perl.o objects/if_perlsfio.o"
1251-
PERL_PRO="if_perl.pro if_perlsfio.pro"
1249+
PERL_SRC="auto/if_perl.c"
1250+
PERL_OBJ="objects/if_perl.o"
1251+
PERL_PRO="if_perl.pro"
12521252
AC_DEFINE(FEAT_PERL)
12531253
fi
12541254
fi
@@ -1274,7 +1274,7 @@ if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then
12741274
if test -n "$PERL"; then
12751275
PERL_DIR="$dir"
12761276
PERL_CFLAGS="-DFEAT_PERL -I$darwindir/CORE"
1277-
PERL_OBJ="objects/if_perl.o objects/if_perlsfio.o $darwindir/auto/DynaLoader/DynaLoader.a"
1277+
PERL_OBJ="objects/if_perl.o $darwindir/auto/DynaLoader/DynaLoader.a"
12781278
PERL_LIBS="-L$darwindir/CORE -lperl"
12791279
fi
12801280
dnl Perl on Mac OS X 10.5 adds "-arch" flags but these should only

‎src/if_perl.xs‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
#include <EXTERN.h>
4949
#include <perl.h>
5050
#include <XSUB.h>
51-
#if defined(PERLIO_LAYERS) && !defined(USE_SFIO)
51+
#if defined(PERLIO_LAYERS)
5252
# include <perliol.h>
5353
#endif
5454

@@ -80,7 +80,6 @@ const char PL_memory_wrap[] = "panic: memory wrap";
8080
#ifndef PROTO
8181
# ifndef __MINGW32__
8282
# include "proto/if_perl.pro"
83-
# include "proto/if_perlsfio.pro"
8483
# endif
8584
#endif
8685

@@ -324,7 +323,7 @@ typedef int perl_key;
324323
# define Perl_av_fetch dll_Perl_av_fetch
325324
# define Perl_av_len dll_Perl_av_len
326325
# define Perl_sv_2nv_flags dll_Perl_sv_2nv_flags
327-
# if defined(PERLIO_LAYERS) && !defined(USE_SFIO)
326+
# if defined(PERLIO_LAYERS)
328327
# define PerlIOBase_pushed dll_PerlIOBase_pushed
329328
# define PerlIO_define_layer dll_PerlIO_define_layer
330329
# endif
@@ -497,7 +496,7 @@ static SV * (*Perl_hv_iterval)(pTHX_ HV *, HE *);
497496
static SV** (*Perl_av_fetch)(pTHX_ AV *, SSize_t, I32);
498497
static SSize_t (*Perl_av_len)(pTHX_ AV *);
499498
static NV (*Perl_sv_2nv_flags)(pTHX_ SV *const, const I32);
500-
# if defined(PERLIO_LAYERS) && !defined(USE_SFIO)
499+
# if defined(PERLIO_LAYERS)
501500
static IV (*PerlIOBase_pushed)(pTHX_ PerlIO *, const char *, SV *, PerlIO_funcs *);
502501
static void (*PerlIO_define_layer)(pTHX_ PerlIO_funcs *);
503502
# endif
@@ -655,7 +654,7 @@ static struct {
655654
{"Perl_av_fetch", (PERL_PROC*)&Perl_av_fetch},
656655
{"Perl_av_len", (PERL_PROC*)&Perl_av_len},
657656
{"Perl_sv_2nv_flags", (PERL_PROC*)&Perl_sv_2nv_flags},
658-
# if defined(PERLIO_LAYERS) && !defined(USE_SFIO)
657+
# if defined(PERLIO_LAYERS)
659658
{"PerlIOBase_pushed", (PERL_PROC*)&PerlIOBase_pushed},
660659
{"PerlIO_define_layer", (PERL_PROC*)&PerlIO_define_layer},
661660
# endif
@@ -721,7 +720,7 @@ perl_enabled(int verbose)
721720
}
722721
#endif /* DYNAMIC_PERL */
723722

724-
#if defined(PERLIO_LAYERS) && !defined(USE_SFIO)
723+
#if defined(PERLIO_LAYERS)
725724
static void vim_IOLayer_init(void);
726725
#endif
727726

@@ -745,12 +744,7 @@ perl_init(void)
745744
perl_parse(perl_interp, xs_init, argc, argv, 0);
746745
perl_call_argv("VIM::bootstrap", (long)G_DISCARD, bootargs);
747746
VIM_init();
748-
#ifdef USE_SFIO
749-
sfdisc(PerlIO_stdout(), sfdcnewvim());
750-
sfdisc(PerlIO_stderr(), sfdcnewvim());
751-
sfsetbuf(PerlIO_stdout(), NULL, 0);
752-
sfsetbuf(PerlIO_stderr(), NULL, 0);
753-
#elif defined(PERLIO_LAYERS)
747+
#if defined(PERLIO_LAYERS)
754748
vim_IOLayer_init();
755749
#endif
756750
}
@@ -1399,7 +1393,7 @@ err:
13991393
}
14001394
}
14011395

1402-
#if defined(PERLIO_LAYERS) && !defined(USE_SFIO)
1396+
#if defined(PERLIO_LAYERS)
14031397
typedef struct {
14041398
struct _PerlIO base;
14051399
int attr;
@@ -1470,7 +1464,7 @@ vim_IOLayer_init(void)
14701464
(void)eval_pv( "binmode(STDOUT, ':Vim')"
14711465
" && binmode(STDERR, ':Vim(ErrorMsg)');", 0);
14721466
}
1473-
#endif /* PERLIO_LAYERS && !USE_SFIO */
1467+
#endif /* PERLIO_LAYERS */
14741468

14751469
#ifdef DYNAMIC_PERL
14761470

‎src/if_perlsfio.c‎

Lines changed: 0 additions & 66 deletions
This file was deleted.

0 commit comments

Comments
 (0)