diff options
| -rw-r--r-- | Makefile.SH | 2 | ||||
| -rw-r--r-- | op.c | 4 | ||||
| -rw-r--r-- | pod/perldelta.pod | 12 | ||||
| -rw-r--r-- | win32/Makefile | 4 | ||||
| -rw-r--r-- | win32/makefile.mk | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/Makefile.SH b/Makefile.SH index c17719e26a..7c00b5bf93 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -337,7 +337,7 @@ $(LIBPERL_NONSHR): perl$(OBJ_EXT) $(obj) $(AR) rcu $(LIBPERL_NONSHR) perl$(OBJ_EXT) $(obj) $(MINIPERL_NONSHR): $(LIBPERL_NONSHR) miniperlmain$(OBJ_EXT) - $(CCCMD) $(PLDLFLAGS) -DMINIPERL_BUILD -o opmini$(OBJ_EXT) op.c + $(CCCMD) $(PLDLFLAGS) -DPERL_EXTERNAL_GLOB -o opmini$(OBJ_EXT) op.c $(CC) $(LDFLAGS) -o $(MINIPERL_NONSHR) miniperlmain$(OBJ_EXT) \ opmini$(OBJ_EXT) $(LIBPERL_NONSHR) $(LIBS) @@ -5370,7 +5370,7 @@ Perl_ck_glob(pTHX_ OP *o) if (!((gv = gv_fetchpv("glob", FALSE, SVt_PVCV)) && GvIMPORTED_CV(gv))) gv = gv_fetchpv("CORE::GLOBAL::glob", FALSE, SVt_PVCV); -#if defined(PERL_INTERNAL_GLOB) && !defined(MINIPERL_BUILD) +#if !defined(PERL_EXTERNAL_GLOB) /* XXX this can be tightened up and made more failsafe. */ if (!gv) { OP *modname = newSVOP(OP_CONST, 0, newSVpvn("File::Glob", 10)); @@ -5381,7 +5381,7 @@ Perl_ck_glob(pTHX_ OP *o) gv = gv_fetchpv("CORE::GLOBAL::glob", FALSE, SVt_PVCV); LEAVE; } -#endif /* PERL_INTERNAL_GLOB && !MINIPERL_BUILD */ +#endif /* PERL_EXTERNAL_GLOB */ if (gv && GvIMPORTED_CV(gv)) { append_elem(OP_GLOB, o, diff --git a/pod/perldelta.pod b/pod/perldelta.pod index 47a9eb13c5..74bb7e7e9b 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -333,9 +333,9 @@ change#3385, also need perlguts documentation WARNING: This is currently an experimental feature. Interfaces and implementation are likely to change. -Perl can be compiled with -DPERL_INTERNAL_GLOB to use the File::Glob -implementation of the glob() operator. This avoids using an external -csh process and the problems associated with it. +Perl now uses the File::Glob implementation of the glob() operator +automatically. This avoids using an external csh process and the +problems associated with it. =head2 Binary numbers supported @@ -1149,9 +1149,9 @@ when pruning top-level directories has been fixed. =item File::Glob -This extension implements BSD-style file globbing. It will also be -used for the internal implementation of the glob() operator if -Perl was compiled with -DPERL_INTERNAL_GLOB. See L<File::Glob>. +This extension implements BSD-style file globbing. By default, +it will also be used for the internal implementation of the glob() +operator. See L<File::Glob>. =item File::Spec diff --git a/win32/Makefile b/win32/Makefile index 3be8bee0ea..90244e2f5e 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -157,9 +157,9 @@ CCLIBDIR = $(CCHOME)\lib #BUILDOPT = $(BUILDOPT) -DPERL_POLLUTE # -# enable this to test the File::Glob implementation of CORE::glob +# enable this to disable the File::Glob implementation of CORE::glob # -#BUILDOPT = $(BUILDOPT) -DPERL_INTERNAL_GLOB +#BUILDOPT = $(BUILDOPT) -DPERL_EXTERNAL_GLOB # Enabling this runs a cloned toplevel interpreter (fails tests) #BUILDOPT = $(BUILDOPT) -DTOP_CLONE diff --git a/win32/makefile.mk b/win32/makefile.mk index 206796f273..a0482032e5 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -176,9 +176,9 @@ CCLIBDIR *= $(CCHOME)\lib #BUILDOPT += -DPERL_POLLUTE # -# enable this to test the File::Glob implementation of CORE::glob +# enable this to disable the File::Glob implementation of CORE::glob # -#BUILDOPT += -DPERL_INTERNAL_GLOB +#BUILDOPT += -DPERL_EXTERNAL_GLOB # Enabling this runs a cloned toplevel interpreter (fails tests) #BUILDOPT += -DTOP_CLONE |