[asperl] integrate mainline changes (untested)

[perl5.git] / win32 / config_H.bc

diff --git a/win32/config_H.bc b/win32/config_H.bc
index e1b8543..2e645a8 100644 (file)
--- a/win32/config_H.bc
+++ b/win32/config_H.bc
@@ -924,6 +924,10 @@
  *     This symbol, if defined, indicates to the C program that struct passwd
  *     contains pw_expire.
  */
+/* PWGECOS:
+ *     This symbol, if defined, indicates to the C program that struct passwd
+ *     contains pw_gecos.
+ */
 /* PWCOMMENT:
  *     This symbol, if defined, indicates to the C program that struct passwd
  *     contains pw_comment.
@@ -934,6 +938,7 @@
 /*#define PWCHANGE     /**/
 /*#define PWCLASS      /**/
 /*#define PWEXPIRE     /**/
+/*#define PWGECOS      /**/
 /*#define PWCOMMENT    /**/
 
 /* I_SFIO:
@@ -1096,7 +1101,7 @@
 /* MYMALLOC:
  *     This symbol, if defined, indicates that we're using our own malloc.
  */
-#define MYMALLOC                       /**/
+/*#define MYMALLOC                     /**/
 
 /* CAN_PROTOTYPE:
  *     If defined, this macro indicates that the C compiler can handle
@@ -1486,8 +1491,8 @@
  *     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:\\perl5004.5x\\lib\\MSWin32-x86"            /**/
-#define ARCHLIB_EXP (win32_perllib_path(ARCHNAME,NULL))        /**/
+/* #define ARCHLIB "c:\\perl5004.5x\\lib\\MSWin32-x86"         /**/
+/* #define ARCHLIB_EXP (win32_perllib_path(ARCHNAME,NULL))     /**/
 
 /* CAT2:
  *     This macro catenates 2 tokens together.
@@ -1738,7 +1743,7 @@
  *     in programs that are not prepared to deal with ~ expansion at run-time.
  */
 #define PRIVLIB "c:\\perl5004.5x\\lib"         /**/
-#define PRIVLIB_EXP (win32_perllib_path(NULL)) /**/
+#define PRIVLIB_EXP (win32_get_stdlib(patchlevel))     /**/
 
 /* SITEARCH:
  *     This symbol contains the name of the private library for this package.
@@ -1753,8 +1758,8 @@
  *     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:\\perl5004.5x\\lib\\site\\MSWin32-x86"             /**/
-#define SITEARCH_EXP (win32_perllib_path("site",ARCHNAME,NULL))        /**/
+/* #define SITEARCH "c:\\perl5004.5x\\lib\\site\\MSWin32-x86"          /**/
+/* #define SITEARCH_EXP (win32_perllib_path("site",ARCHNAME,NULL))     /**/
 
 /* SITELIB:
  *     This symbol contains the name of the private library for this package.
@@ -1770,7 +1775,7 @@
  *     in programs that are not prepared to deal with ~ expansion at run-time.
  */
 #define SITELIB "c:\\perl5004.5x\\lib\\site"           /**/
-#define SITELIB_EXP (win32_perllib_path("site",NULL))  /**/
+#define SITELIB_EXP (win32_get_sitelib(patchlevel))    /**/
 
 /* DLSYM_NEEDS_UNDERSCORE:
  *     This symbol, if defined, indicates that we need to prepend an