summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--patchlevel.h5
-rw-r--r--win32/Makefile2
-rw-r--r--win32/config.bc2
-rw-r--r--win32/config.gc2
-rw-r--r--win32/config.vc2
-rw-r--r--win32/config_H.bc38
-rw-r--r--win32/config_H.gc38
-rw-r--r--win32/config_H.vc38
-rw-r--r--win32/makefile.mk2
9 files changed, 71 insertions, 58 deletions
diff --git a/patchlevel.h b/patchlevel.h
index 42347bc621..0b8d9beeda 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -4,8 +4,8 @@
* exactly on the third column */
#define PERL_REVISION 5 /* age */
-#define PERL_VERSION 5 /* epoch */
-#define PERL_SUBVERSION 670 /* generation */
+#define PERL_VERSION 6 /* epoch */
+#define PERL_SUBVERSION 0 /* generation */
/* The following numbers describe the earliest compatible version of
Perl ("compatibility" here being defined as sufficient binary/API
@@ -70,6 +70,7 @@
#if !defined(PERL_PATCHLEVEL_H_IMPLICIT) && !defined(LOCAL_PATCH_COUNT)
static char * __attribute__ ((unused)) local_patches[] = {
NULL
+ , "v5.6.0-RC1"
,NULL
};
diff --git a/win32/Makefile b/win32/Makefile
index 3909230d4f..d96da84047 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -29,7 +29,7 @@ INST_TOP = $(INST_DRV)\perl
# versioned installation can be obtained by setting INST_TOP above to a
# path that includes an arbitrary version string.
#
-INST_VER = \5.5.670
+INST_VER = \5.6.0
#
# Comment this out if you DON'T want your perl installation to have
diff --git a/win32/config.bc b/win32/config.bc
index 59d96f62b8..fdd26dea8e 100644
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -761,7 +761,7 @@ version='~VERSION~'
vi=''
voidflags='15'
xlibpth='/usr/lib/386 /lib/386'
-xs_apiversion='5.5.670'
+xs_apiversion='5.6.0'
zcat=''
zip='zip'
PERL_REVISION='~PERL_REVISION~'
diff --git a/win32/config.gc b/win32/config.gc
index d932482031..9df20c2761 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -761,7 +761,7 @@ version='~VERSION~'
vi=''
voidflags='15'
xlibpth='/usr/lib/386 /lib/386'
-xs_apiversion='5.5.670'
+xs_apiversion='5.6.0'
zcat=''
zip='zip'
PERL_REVISION='~PERL_REVISION~'
diff --git a/win32/config.vc b/win32/config.vc
index 4865d5b3a5..c3e1f7d6cf 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -761,7 +761,7 @@ version='~VERSION~'
vi=''
voidflags='15'
xlibpth='/usr/lib/386 /lib/386'
-xs_apiversion='5.5.670'
+xs_apiversion='5.6.0'
zcat=''
zip='zip'
PERL_REVISION='~PERL_REVISION~'
diff --git a/win32/config_H.bc b/win32/config_H.bc
index e87972119f..1ec6d557a9 100644
--- a/win32/config_H.bc
+++ b/win32/config_H.bc
@@ -13,7 +13,7 @@
/*
* Package name : perl5
* Source directory :
- * Configuration time: Sat Mar 4 12:46:42 2000
+ * Configuration time: Sun Mar 5 04:30:07 2000
* Configured by : gsar
* Target system :
*/
@@ -1094,7 +1094,7 @@
* This symbol contains the ~name expanded version of ARCHLIB, to be used
* in programs that are not prepared to deal with ~ expansion at run-time.
*/
-#define ARCHLIB "c:\\perl\\5.5.670\\lib\\MSWin32-x86" /**/
+#define ARCHLIB "c:\\perl\\5.6.0\\lib\\MSWin32-x86" /**/
/*#define ARCHLIB_EXP "" /**/
/* ARCHNAME:
@@ -1125,8 +1125,8 @@
* This symbol is the filename expanded version of the BIN symbol, for
* programs that do not want to deal with that at run-time.
*/
-#define BIN "c:\\perl\\5.5.670\\bin\\MSWin32-x86" /**/
-#define BIN_EXP "c:\\perl\\5.5.670\\bin\\MSWin32-x86" /**/
+#define BIN "c:\\perl\\5.6.0\\bin\\MSWin32-x86" /**/
+#define BIN_EXP "c:\\perl\\5.6.0\\bin\\MSWin32-x86" /**/
/* PERL_BINCOMPAT_5005:
* This symbol, if defined, indicates that Perl 5.006 should be
@@ -1186,14 +1186,18 @@
* This macro surrounds its token with double quotes.
*/
#if 42 == 1
-#define CAT2(a,b)a/**/b
-#define STRINGIFY(a)"a"
+# define CAT2(a,b) a/**/b
+# define STRINGIFY(a) "a"
/* If you can get stringification with catify, tell me how! */
#endif
#if 42 == 42
-#define CAT2(a,b)a ## b
-#define StGiFy(a)# a
-#define STRINGIFY(a)StGiFy(a)
+# define PeRl_CaTiFy(a, b) a ## b
+# define PeRl_StGiFy(a) #a
+/* the additional level of indirection enables these macros to be
+ * used as arguments to other macros. See K&R 2nd ed., page 231. */
+# define CAT2(a,b) PeRl_CaTiFy(a,b)
+# define StGiFy(a) PeRl_StGiFy(a)
+# define STRINGIFY(a) PeRl_StGiFy(a)
#endif
#if 42 != 1 && 42 != 42
#include "Bletch: How does this C preprocessor catenate tokens?"
@@ -2671,8 +2675,8 @@
* This symbol contains the ~name expanded version of PRIVLIB, to be used
* in programs that are not prepared to deal with ~ expansion at run-time.
*/
-#define PRIVLIB "c:\\perl\\5.5.670\\lib" /**/
-#define PRIVLIB_EXP (win32_get_privlib("5.5.670")) /**/
+#define PRIVLIB "c:\\perl\\5.6.0\\lib" /**/
+#define PRIVLIB_EXP (win32_get_privlib("5.6.0")) /**/
/* PTRSIZE:
* This symbol contains the size of a pointer, so that the C preprocessor
@@ -2770,7 +2774,7 @@
* This symbol contains the ~name expanded version of SITEARCH, to be used
* in programs that are not prepared to deal with ~ expansion at run-time.
*/
-#define SITEARCH "c:\\perl\\site\\5.5.670\\lib\\MSWin32-x86" /**/
+#define SITEARCH "c:\\perl\\site\\5.6.0\\lib\\MSWin32-x86" /**/
/*#define SITEARCH_EXP "" /**/
/* SITELIB:
@@ -2788,8 +2792,8 @@
* This symbol contains the ~name expanded version of SITELIB, to be used
* in programs that are not prepared to deal with ~ expansion at run-time.
*/
-#define SITELIB "c:\\perl\\site\\5.5.670\\lib" /**/
-#define SITELIB_EXP (win32_get_sitelib("5.5.670")) /**/
+#define SITELIB "c:\\perl\\site\\5.6.0\\lib" /**/
+#define SITELIB_EXP (win32_get_sitelib("5.6.0")) /**/
/* Size_t:
* This symbol holds the type used to declare length parameters
@@ -2972,7 +2976,7 @@
/* PERL_XS_APIVERSION:
* This variable contains the version of the oldest perl binary
* compatible with the present perl. perl.c:incpush() and
- * lib/lib.pm will automatically search in c:\\perl\\site\\5.5.670\\lib\\MSWin32-x86 for older
+ * lib/lib.pm will automatically search in c:\\perl\\site\\5.6.0\\lib\\MSWin32-x86 for older
* directories across major versions back to xs_apiversion.
* This is only useful if you have a perl library directory tree
* structured like the default one.
@@ -2991,7 +2995,7 @@
* compatible with the present perl. (That is, pure perl modules
* written for pm_apiversion will still work for the current
* version). perl.c:incpush() and lib/lib.pm will automatically
- * search in c:\\perl\\site\\5.5.670\\lib for older directories across major versions
+ * search in c:\\perl\\site\\5.6.0\\lib for older directories across major versions
* back to pm_apiversion. This is only useful if you have a perl
* library directory tree structured like the default one. The
* versioned site_perl library was introduced in 5.005, so that's
@@ -3001,7 +3005,7 @@
* (presumably) be similar.
* See the INSTALL file for how this works.
*/
-#define PERL_XS_APIVERSION "5.5.670"
+#define PERL_XS_APIVERSION "5.6.0"
#define PERL_PM_APIVERSION "5.005"
/* HAS_GETFSSTAT:
diff --git a/win32/config_H.gc b/win32/config_H.gc
index 10ed5fed9e..5081c37789 100644
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@ -13,7 +13,7 @@
/*
* Package name : perl5
* Source directory :
- * Configuration time: Sat Mar 4 12:46:54 2000
+ * Configuration time: Sun Mar 5 04:30:17 2000
* Configured by : gsar
* Target system :
*/
@@ -1094,7 +1094,7 @@
* This symbol contains the ~name expanded version of ARCHLIB, to be used
* in programs that are not prepared to deal with ~ expansion at run-time.
*/
-#define ARCHLIB "c:\\perl\\5.5.670\\lib\\MSWin32-x86" /**/
+#define ARCHLIB "c:\\perl\\5.6.0\\lib\\MSWin32-x86" /**/
/*#define ARCHLIB_EXP "" /**/
/* ARCHNAME:
@@ -1125,8 +1125,8 @@
* This symbol is the filename expanded version of the BIN symbol, for
* programs that do not want to deal with that at run-time.
*/
-#define BIN "c:\\perl\\5.5.670\\bin\\MSWin32-x86" /**/
-#define BIN_EXP "c:\\perl\\5.5.670\\bin\\MSWin32-x86" /**/
+#define BIN "c:\\perl\\5.6.0\\bin\\MSWin32-x86" /**/
+#define BIN_EXP "c:\\perl\\5.6.0\\bin\\MSWin32-x86" /**/
/* PERL_BINCOMPAT_5005:
* This symbol, if defined, indicates that Perl 5.006 should be
@@ -1186,14 +1186,18 @@
* This macro surrounds its token with double quotes.
*/
#if 42 == 1
-#define CAT2(a,b)a/**/b
-#define STRINGIFY(a)"a"
+# define CAT2(a,b) a/**/b
+# define STRINGIFY(a) "a"
/* If you can get stringification with catify, tell me how! */
#endif
#if 42 == 42
-#define CAT2(a,b)a ## b
-#define StGiFy(a)# a
-#define STRINGIFY(a)StGiFy(a)
+# define PeRl_CaTiFy(a, b) a ## b
+# define PeRl_StGiFy(a) #a
+/* the additional level of indirection enables these macros to be
+ * used as arguments to other macros. See K&R 2nd ed., page 231. */
+# define CAT2(a,b) PeRl_CaTiFy(a,b)
+# define StGiFy(a) PeRl_StGiFy(a)
+# define STRINGIFY(a) PeRl_StGiFy(a)
#endif
#if 42 != 1 && 42 != 42
#include "Bletch: How does this C preprocessor catenate tokens?"
@@ -2671,8 +2675,8 @@
* This symbol contains the ~name expanded version of PRIVLIB, to be used
* in programs that are not prepared to deal with ~ expansion at run-time.
*/
-#define PRIVLIB "c:\\perl\\5.5.670\\lib" /**/
-#define PRIVLIB_EXP (win32_get_privlib("5.5.670")) /**/
+#define PRIVLIB "c:\\perl\\5.6.0\\lib" /**/
+#define PRIVLIB_EXP (win32_get_privlib("5.6.0")) /**/
/* PTRSIZE:
* This symbol contains the size of a pointer, so that the C preprocessor
@@ -2770,7 +2774,7 @@
* This symbol contains the ~name expanded version of SITEARCH, to be used
* in programs that are not prepared to deal with ~ expansion at run-time.
*/
-#define SITEARCH "c:\\perl\\site\\5.5.670\\lib\\MSWin32-x86" /**/
+#define SITEARCH "c:\\perl\\site\\5.6.0\\lib\\MSWin32-x86" /**/
/*#define SITEARCH_EXP "" /**/
/* SITELIB:
@@ -2788,8 +2792,8 @@
* This symbol contains the ~name expanded version of SITELIB, to be used
* in programs that are not prepared to deal with ~ expansion at run-time.
*/
-#define SITELIB "c:\\perl\\site\\5.5.670\\lib" /**/
-#define SITELIB_EXP (win32_get_sitelib("5.5.670")) /**/
+#define SITELIB "c:\\perl\\site\\5.6.0\\lib" /**/
+#define SITELIB_EXP (win32_get_sitelib("5.6.0")) /**/
/* Size_t:
* This symbol holds the type used to declare length parameters
@@ -2972,7 +2976,7 @@
/* PERL_XS_APIVERSION:
* This variable contains the version of the oldest perl binary
* compatible with the present perl. perl.c:incpush() and
- * lib/lib.pm will automatically search in c:\\perl\\site\\5.5.670\\lib\\MSWin32-x86 for older
+ * lib/lib.pm will automatically search in c:\\perl\\site\\5.6.0\\lib\\MSWin32-x86 for older
* directories across major versions back to xs_apiversion.
* This is only useful if you have a perl library directory tree
* structured like the default one.
@@ -2991,7 +2995,7 @@
* compatible with the present perl. (That is, pure perl modules
* written for pm_apiversion will still work for the current
* version). perl.c:incpush() and lib/lib.pm will automatically
- * search in c:\\perl\\site\\5.5.670\\lib for older directories across major versions
+ * search in c:\\perl\\site\\5.6.0\\lib for older directories across major versions
* back to pm_apiversion. This is only useful if you have a perl
* library directory tree structured like the default one. The
* versioned site_perl library was introduced in 5.005, so that's
@@ -3001,7 +3005,7 @@
* (presumably) be similar.
* See the INSTALL file for how this works.
*/
-#define PERL_XS_APIVERSION "5.5.670"
+#define PERL_XS_APIVERSION "5.6.0"
#define PERL_PM_APIVERSION "5.005"
/* HAS_GETFSSTAT:
diff --git a/win32/config_H.vc b/win32/config_H.vc
index 32a1d844d8..0706969f4f 100644
--- a/win32/config_H.vc
+++ b/win32/config_H.vc
@@ -13,7 +13,7 @@
/*
* Package name : perl5
* Source directory :
- * Configuration time: Sat Mar 4 12:47:04 2000
+ * Configuration time: Sun Mar 5 04:30:31 2000
* Configured by : gsar
* Target system :
*/
@@ -1094,7 +1094,7 @@
* This symbol contains the ~name expanded version of ARCHLIB, to be used
* in programs that are not prepared to deal with ~ expansion at run-time.
*/
-#define ARCHLIB "c:\\perl\\5.5.670\\lib\\MSWin32-x86" /**/
+#define ARCHLIB "c:\\perl\\5.6.0\\lib\\MSWin32-x86" /**/
/*#define ARCHLIB_EXP "" /**/
/* ARCHNAME:
@@ -1125,8 +1125,8 @@
* This symbol is the filename expanded version of the BIN symbol, for
* programs that do not want to deal with that at run-time.
*/
-#define BIN "c:\\perl\\5.5.670\\bin\\MSWin32-x86" /**/
-#define BIN_EXP "c:\\perl\\5.5.670\\bin\\MSWin32-x86" /**/
+#define BIN "c:\\perl\\5.6.0\\bin\\MSWin32-x86" /**/
+#define BIN_EXP "c:\\perl\\5.6.0\\bin\\MSWin32-x86" /**/
/* PERL_BINCOMPAT_5005:
* This symbol, if defined, indicates that Perl 5.006 should be
@@ -1186,14 +1186,18 @@
* This macro surrounds its token with double quotes.
*/
#if 42 == 1
-#define CAT2(a,b)a/**/b
-#define STRINGIFY(a)"a"
+# define CAT2(a,b) a/**/b
+# define STRINGIFY(a) "a"
/* If you can get stringification with catify, tell me how! */
#endif
#if 42 == 42
-#define CAT2(a,b)a ## b
-#define StGiFy(a)# a
-#define STRINGIFY(a)StGiFy(a)
+# define PeRl_CaTiFy(a, b) a ## b
+# define PeRl_StGiFy(a) #a
+/* the additional level of indirection enables these macros to be
+ * used as arguments to other macros. See K&R 2nd ed., page 231. */
+# define CAT2(a,b) PeRl_CaTiFy(a,b)
+# define StGiFy(a) PeRl_StGiFy(a)
+# define STRINGIFY(a) PeRl_StGiFy(a)
#endif
#if 42 != 1 && 42 != 42
#include "Bletch: How does this C preprocessor catenate tokens?"
@@ -2671,8 +2675,8 @@
* This symbol contains the ~name expanded version of PRIVLIB, to be used
* in programs that are not prepared to deal with ~ expansion at run-time.
*/
-#define PRIVLIB "c:\\perl\\5.5.670\\lib" /**/
-#define PRIVLIB_EXP (win32_get_privlib("5.5.670")) /**/
+#define PRIVLIB "c:\\perl\\5.6.0\\lib" /**/
+#define PRIVLIB_EXP (win32_get_privlib("5.6.0")) /**/
/* PTRSIZE:
* This symbol contains the size of a pointer, so that the C preprocessor
@@ -2770,7 +2774,7 @@
* This symbol contains the ~name expanded version of SITEARCH, to be used
* in programs that are not prepared to deal with ~ expansion at run-time.
*/
-#define SITEARCH "c:\\perl\\site\\5.5.670\\lib\\MSWin32-x86" /**/
+#define SITEARCH "c:\\perl\\site\\5.6.0\\lib\\MSWin32-x86" /**/
/*#define SITEARCH_EXP "" /**/
/* SITELIB:
@@ -2788,8 +2792,8 @@
* This symbol contains the ~name expanded version of SITELIB, to be used
* in programs that are not prepared to deal with ~ expansion at run-time.
*/
-#define SITELIB "c:\\perl\\site\\5.5.670\\lib" /**/
-#define SITELIB_EXP (win32_get_sitelib("5.5.670")) /**/
+#define SITELIB "c:\\perl\\site\\5.6.0\\lib" /**/
+#define SITELIB_EXP (win32_get_sitelib("5.6.0")) /**/
/* Size_t:
* This symbol holds the type used to declare length parameters
@@ -2972,7 +2976,7 @@
/* PERL_XS_APIVERSION:
* This variable contains the version of the oldest perl binary
* compatible with the present perl. perl.c:incpush() and
- * lib/lib.pm will automatically search in c:\\perl\\site\\5.5.670\\lib\\MSWin32-x86 for older
+ * lib/lib.pm will automatically search in c:\\perl\\site\\5.6.0\\lib\\MSWin32-x86 for older
* directories across major versions back to xs_apiversion.
* This is only useful if you have a perl library directory tree
* structured like the default one.
@@ -2991,7 +2995,7 @@
* compatible with the present perl. (That is, pure perl modules
* written for pm_apiversion will still work for the current
* version). perl.c:incpush() and lib/lib.pm will automatically
- * search in c:\\perl\\site\\5.5.670\\lib for older directories across major versions
+ * search in c:\\perl\\site\\5.6.0\\lib for older directories across major versions
* back to pm_apiversion. This is only useful if you have a perl
* library directory tree structured like the default one. The
* versioned site_perl library was introduced in 5.005, so that's
@@ -3001,7 +3005,7 @@
* (presumably) be similar.
* See the INSTALL file for how this works.
*/
-#define PERL_XS_APIVERSION "5.5.670"
+#define PERL_XS_APIVERSION "5.6.0"
#define PERL_PM_APIVERSION "5.005"
/* HAS_GETFSSTAT:
diff --git a/win32/makefile.mk b/win32/makefile.mk
index d727c9f13f..3d4f57e955 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -33,7 +33,7 @@ INST_TOP *= $(INST_DRV)\perl
# versioned installation can be obtained by setting INST_TOP above to a
# path that includes an arbitrary version string.
#
-INST_VER *= \5.5.670
+INST_VER *= \5.6.0
#
# Comment this out if you DON'T want your perl installation to have
View Lorry Controller Status