[win32] fix build problems due to renamed Config variables

p4raw-id: //depot/win32/perl@525

7 files changed, 273 insertions, 70 deletions

diff --git a/win32/config.bc b/win32/config.bc
index 28b690785b..5c6fb264e9 100644
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -130,7 +130,14 @@ d_fsetpos='define'
 d_getgrps='undef'
 d_setgrps='undef'
 d_gethent='undef'
-d_gethname='undef'
+d_gethbyaddr='define'
+d_gethbyname='define'
+d_getnbyaddr='undef'
+d_getnbyname='undef'
+d_getpbyname='define'
+d_getpbynumber='define'
+d_getsbyname='define'
+d_getsbyport='define'
 d_getlogin='define'
 d_getpgrp2='undef'
 d_getpgrp='undef'
@@ -286,9 +293,10 @@ full_csh=''
 full_sed=''
 gcc=''
 gccversion=''
-gethbadd_addr_type='char *'
-gethbadd_alen_type='int'
-getnbadd_net_type='long'
+netdb_host_type='char *'
+netdb_hlen_type='int'
+netdb_name_type='char *'
+netdb_net_type='long'
 gidtype='gid_t'
 glibpth='/usr/shlib  /lib/pa1.1 /usr/lib/large /lib /usr/lib /usr/lib/386 /lib/386 /lib/large /usr/lib/small /lib/small /usr/ccs/lib /usr/ucblib /usr/shlib '
 grep='grep'
diff --git a/win32/config.gc b/win32/config.gc
index 11e676a329..c8d11d88ca 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -130,7 +130,14 @@ d_fsetpos='define'
 d_getgrps='undef'
 d_setgrps='undef'
 d_gethent='undef'
-d_gethname='undef'
+d_gethbyaddr='define'
+d_gethbyname='define'
+d_getnbyaddr='undef'
+d_getnbyname='undef'
+d_getpbyname='define'
+d_getpbynumber='define'
+d_getsbyname='define'
+d_getsbyport='define'
 d_getlogin='define'
 d_getpgrp2='undef'
 d_getpgrp='undef'
@@ -286,9 +293,10 @@ full_csh=''
 full_sed=''
 gcc=''
 gccversion=''
-gethbadd_addr_type='char *'
-gethbadd_alen_type='int'
-getnbadd_net_type='long'
+netdb_host_type='char *'
+netdb_hlen_type='int'
+netdb_name_type='char *'
+netdb_net_type='long'
 gidtype='gid_t'
 glibpth='/usr/shlib  /lib/pa1.1 /usr/lib/large /lib /usr/lib /usr/lib/386 /lib/386 /lib/large /usr/lib/small /lib/small /usr/ccs/lib /usr/ucblib /usr/shlib '
 grep='grep'
diff --git a/win32/config.vc b/win32/config.vc
index 240f2a81e8..a7abb31854 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -130,7 +130,14 @@ d_fsetpos='define'
 d_getgrps='undef'
 d_setgrps='undef'
 d_gethent='undef'
-d_gethname='undef'
+d_gethbyaddr='define'
+d_gethbyname='define'
+d_getnbyaddr='undef'
+d_getnbyname='undef'
+d_getpbyname='define'
+d_getpbynumber='define'
+d_getsbyname='define'
+d_getsbyport='define'
 d_getlogin='define'
 d_getpgrp2='undef'
 d_getpgrp='undef'
@@ -286,9 +293,10 @@ full_csh=''
 full_sed=''
 gcc=''
 gccversion=''
-gethbadd_addr_type='char *'
-gethbadd_alen_type='int'
-getnbadd_net_type='long'
+netdb_host_type='char *'
+netdb_hlen_type='int'
+netdb_name_type='char *'
+netdb_net_type='long'
 gidtype='gid_t'
 glibpth='/usr/shlib  /lib/pa1.1 /usr/lib/large /lib /usr/lib /usr/lib/386 /lib/386 /lib/large /usr/lib/small /lib/small /usr/ccs/lib /usr/ucblib /usr/shlib '
 grep='grep'
diff --git a/win32/config_H.bc b/win32/config_H.bc
index f587e019c8..f0595772ea 100644
--- a/win32/config_H.bc
+++ b/win32/config_H.bc
@@ -47,7 +47,7 @@
  *	where library files may be held under a private library, for
  *	instance.
  */
-#define ARCHNAME "MSWin32-x86-thread"		/**/
+#define ARCHNAME "MSWin32-x86"		/**/
 
 /* BIN:
  *	This symbol holds the path of the bin directory where the package will
@@ -311,35 +311,80 @@
  */
 /*#define HAS_GETHOSTENT		/**/
 
-/* HAS_GETHBADD:
+/* HAS_GETHOSTBYADDR:
  *	This symbol, if defined, indicates that the gethostbyaddr routine is
- *	available to lookup host names by their IP addresses.
+ *	available to lookup hosts by their IP addresses.
  */
-/*#define HAS_GETHBADD		/**/
+#define HAS_GETHOSTBYADDR		/**/
 
-/* Gethbadd_addr_t:
+/* Netdb_host_t:
  *	This symbol holds the type used for the 1st argument
  *	to gethostbyaddr().
  */
-#define Gethbadd_addr_t		char *
+#define Netdb_host_t		char *
 
-/* Gethbadd_alen_t:
+/* Netdb_hlen_t:
  *	This symbol holds the type used for the 2nd argument
  *	to gethostbyaddr().
  */
-#define Gethbadd_alen_t		int
+#define Netdb_hlen_t		int
 
-/* HAS_GETNBADD:
+/* HAS_GETHOSTBYNAME:
+ *	This symbol, if defined, indicates that the gethostbyname routine is
+ *	available to lookup hosts by their DNS names.
+ */
+#define HAS_GETHOSTBYNAME		/**/
+
+/* Netdb_name_t:
+ *	This symbol holds the type used for the 1st argument
+ *	to gethostbyname(), the 1st argument to getnetbyname(),
+ *	the 1st argument to getprotobyname(), the 1st argument to
+ *	getservbyname(), the 2nd argument to getservbyname(),
+ *	and the 2nd argument to getservbyport().
+ */
+#define Netdb_name_t		char *
+
+/* HAS_GETNETBYADD:
  *	This symbol, if defined, indicates that the getnetbyaddr routine is
  *	available to lookup networks by their IP addresses.
  */
-/*#define HAS_GETNBADD		/**/
+/*#define HAS_GETNETBYADD		/**/
 
-/* Gethbadd_net_t:
+/* Netdb_net_t:
  *	This symbol holds the type used for the 1st argument
  *	to getnetbyaddr().
  */
-#define Getnbadd_net_t		long
+#define Netdb_net_t		long
+
+/* HAS_GETNETBYNAME:
+ *	This symbol, if defined, indicates that the getnetbyname routine is
+ *	available to lookup networks by their names.
+ */
+/*#define HAS_GETNETBYNAME		/**/
+
+/* HAS_GETPROTOBYNAME:
+ *	This symbol, if defined, indicates that the getprotobyname routine is
+ *	available to lookup protocols by their names.
+ */
+#define HAS_GETPROTOBYNAME		/**/
+
+/* HAS_GETPROTOBYNUMBER:
+ *	This symbol, if defined, indicates that the getprotobynumber routine is
+ *	available to lookup protocols by their numbers.
+ */
+#define HAS_GETPROTOBYNUMBER		/**/
+
+/* HAS_GETSERVBYNAME:
+ *	This symbol, if defined, indicates that the getservbyname routine is
+ *	available to lookup services by their names.
+ */
+#define HAS_GETSERVBYNAME		/**/
+
+/* HAS_GETSERVBYPORT:
+ *	This symbol, if defined, indicates that the getservbyport routine is
+ *	available to lookup services by their ports.
+ */
+#define HAS_GETSERVBYPORT		/**/
 
 /* HAS_UNAME:
  *	This symbol, if defined, indicates that the C program may use the
@@ -548,6 +593,12 @@
  */
 /*#define HAS_POLL		/**/
 
+/* HAS_PTHREAD_YIELD:
+ *	This symbol, if defined, indicates that the pthread_yield routine is
+ *	available to yield the execution of the current thread.
+ */
+#undef HAS_PTHREAD_YIELD
+
 /* HAS_READDIR:
  *	This symbol, if defined, indicates that the readdir routine is
  *	available to read directory entries. You may have to include
@@ -555,6 +606,12 @@
  */
 #define HAS_READDIR		/**/
 
+/* HAS_SCHED_YIELD:
+ *	This symbol, if defined, indicates that the sched_yield
+ *	routine is available to yield the execution of the current thread.
+ */
+#undef HAS_SCHED_YIELD
+
 /* HAS_SEEKDIR:
  *	This symbol, if defined, indicates that the seekdir routine is
  *	available. You may have to include <dirent.h>. See I_DIRENT.
@@ -1466,7 +1523,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\\lib\\MSWin32-x86-thread"		/**/
+#define ARCHLIB "c:\\perl\\lib\\MSWin32-x86"		/**/
 #define ARCHLIB_EXP (win32_perllib_path(ARCHNAME,NULL))	/**/
 
 /* BINCOMPAT3:
@@ -1606,6 +1663,12 @@
  */
 /*#define	USE_SFIO		/**/
 
+/* PTHREADS_CREATED_JOINABLE:
+ *	This symbol, if defined, indicates that pthreads are created
+ *	in the joinable (aka undetached) state.
+ */
+/*#define	PTHREADS_CREATED_JOINABLE		/**/
+
 /* Sigjmp_buf:
  *	This is the buffer type to be used with Sigsetjmp and Siglongjmp.
  */
@@ -1769,7 +1832,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\\lib\\site"		/**/
+#define SITEARCH "c:\\perl\\lib\\site\\MSWin32-x86"		/**/
 #define SITEARCH_EXP (win32_perllib_path("site",ARCHNAME,NULL))	/**/
 
 /* SITELIB:
@@ -1829,6 +1892,3 @@
 
 #endif
 #include <win32.h>
-#ifndef DEBUGGING
-#define DEBUGGING
-#endif
diff --git a/win32/config_H.gc b/win32/config_H.gc
index 3e56046835..79b8b7fca1 100644
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@ -47,7 +47,7 @@
  *	where library files may be held under a private library, for
  *	instance.
  */
-#define ARCHNAME "MSWin32-x86-thread"		/**/
+#define ARCHNAME "MSWin32-x86"		/**/
 
 /* BIN:
  *	This symbol holds the path of the bin directory where the package will
@@ -311,35 +311,80 @@
  */
 /*#define HAS_GETHOSTENT		/**/
 
-/* HAS_GETHBADD:
+/* HAS_GETHOSTBYADDR:
  *	This symbol, if defined, indicates that the gethostbyaddr routine is
- *	available to lookup host names by their IP addresses.
+ *	available to lookup hosts by their IP addresses.
  */
-/*#define HAS_GETHBADD		/**/
+#define HAS_GETHOSTBYADDR		/**/
 
-/* Gethbadd_addr_t:
+/* Netdb_host_t:
  *	This symbol holds the type used for the 1st argument
  *	to gethostbyaddr().
  */
-#define Gethbadd_addr_t		char *
+#define Netdb_host_t		char *
 
-/* Gethbadd_alen_t:
+/* Netdb_hlen_t:
  *	This symbol holds the type used for the 2nd argument
  *	to gethostbyaddr().
  */
-#define Gethbadd_alen_t		int
+#define Netdb_hlen_t		int
 
-/* HAS_GETNBADD:
+/* HAS_GETHOSTBYNAME:
+ *	This symbol, if defined, indicates that the gethostbyname routine is
+ *	available to lookup hosts by their DNS names.
+ */
+#define HAS_GETHOSTBYNAME		/**/
+
+/* Netdb_name_t:
+ *	This symbol holds the type used for the 1st argument
+ *	to gethostbyname(), the 1st argument to getnetbyname(),
+ *	the 1st argument to getprotobyname(), the 1st argument to
+ *	getservbyname(), the 2nd argument to getservbyname(),
+ *	and the 2nd argument to getservbyport().
+ */
+#define Netdb_name_t		char *
+
+/* HAS_GETNETBYADD:
  *	This symbol, if defined, indicates that the getnetbyaddr routine is
  *	available to lookup networks by their IP addresses.
  */
-/*#define HAS_GETNBADD		/**/
+/*#define HAS_GETNETBYADD		/**/
 
-/* Gethbadd_net_t:
+/* Netdb_net_t:
  *	This symbol holds the type used for the 1st argument
  *	to getnetbyaddr().
  */
-#define Getnbadd_net_t		long
+#define Netdb_net_t		long
+
+/* HAS_GETNETBYNAME:
+ *	This symbol, if defined, indicates that the getnetbyname routine is
+ *	available to lookup networks by their names.
+ */
+/*#define HAS_GETNETBYNAME		/**/
+
+/* HAS_GETPROTOBYNAME:
+ *	This symbol, if defined, indicates that the getprotobyname routine is
+ *	available to lookup protocols by their names.
+ */
+#define HAS_GETPROTOBYNAME		/**/
+
+/* HAS_GETPROTOBYNUMBER:
+ *	This symbol, if defined, indicates that the getprotobynumber routine is
+ *	available to lookup protocols by their numbers.
+ */
+#define HAS_GETPROTOBYNUMBER		/**/
+
+/* HAS_GETSERVBYNAME:
+ *	This symbol, if defined, indicates that the getservbyname routine is
+ *	available to lookup services by their names.
+ */
+#define HAS_GETSERVBYNAME		/**/
+
+/* HAS_GETSERVBYPORT:
+ *	This symbol, if defined, indicates that the getservbyport routine is
+ *	available to lookup services by their ports.
+ */
+#define HAS_GETSERVBYPORT		/**/
 
 /* HAS_UNAME:
  *	This symbol, if defined, indicates that the C program may use the
@@ -548,6 +593,12 @@
  */
 /*#define HAS_POLL		/**/
 
+/* HAS_PTHREAD_YIELD:
+ *	This symbol, if defined, indicates that the pthread_yield routine is
+ *	available to yield the execution of the current thread.
+ */
+#undef HAS_PTHREAD_YIELD
+
 /* HAS_READDIR:
  *	This symbol, if defined, indicates that the readdir routine is
  *	available to read directory entries. You may have to include
@@ -555,6 +606,12 @@
  */
 #define HAS_READDIR		/**/
 
+/* HAS_SCHED_YIELD:
+ *	This symbol, if defined, indicates that the sched_yield
+ *	routine is available to yield the execution of the current thread.
+ */
+#undef HAS_SCHED_YIELD
+
 /* HAS_SEEKDIR:
  *	This symbol, if defined, indicates that the seekdir routine is
  *	available. You may have to include <dirent.h>. See I_DIRENT.
@@ -1466,7 +1523,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\\lib\\MSWin32-x86-thread"		/**/
+#define ARCHLIB "c:\\perl\\lib\\MSWin32-x86"		/**/
 #define ARCHLIB_EXP (win32_perllib_path(ARCHNAME,NULL))	/**/
 
 /* BINCOMPAT3:
@@ -1606,6 +1663,12 @@
  */
 /*#define	USE_SFIO		/**/
 
+/* PTHREADS_CREATED_JOINABLE:
+ *	This symbol, if defined, indicates that pthreads are created
+ *	in the joinable (aka undetached) state.
+ */
+/*#define	PTHREADS_CREATED_JOINABLE		/**/
+
 /* Sigjmp_buf:
  *	This is the buffer type to be used with Sigsetjmp and Siglongjmp.
  */
@@ -1769,7 +1832,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\\lib\\site"		/**/
+#define SITEARCH "c:\\perl\\lib\\site\\MSWin32-x86"		/**/
 #define SITEARCH_EXP (win32_perllib_path("site",ARCHNAME,NULL))	/**/
 
 /* SITELIB:
@@ -1829,6 +1892,3 @@
 
 #endif
 #include <win32.h>
-#ifndef DEBUGGING
-#define DEBUGGING
-#endif
diff --git a/win32/config_H.vc b/win32/config_H.vc
index 42578bad8e..82b84e764b 100644
--- a/win32/config_H.vc
+++ b/win32/config_H.vc
@@ -47,7 +47,7 @@
  *	where library files may be held under a private library, for
  *	instance.
  */
-#define ARCHNAME "MSWin32-x86-thread"		/**/
+#define ARCHNAME "MSWin32-x86"		/**/
 
 /* BIN:
  *	This symbol holds the path of the bin directory where the package will
@@ -311,35 +311,80 @@
  */
 /*#define HAS_GETHOSTENT		/**/
 
-/* HAS_GETHBADD:
+/* HAS_GETHOSTBYADDR:
  *	This symbol, if defined, indicates that the gethostbyaddr routine is
- *	available to lookup host names by their IP addresses.
+ *	available to lookup hosts by their IP addresses.
  */
-/*#define HAS_GETHBADD		/**/
+#define HAS_GETHOSTBYADDR		/**/
 
-/* Gethbadd_addr_t:
+/* Netdb_host_t:
  *	This symbol holds the type used for the 1st argument
  *	to gethostbyaddr().
  */
-#define Gethbadd_addr_t		char *
+#define Netdb_host_t		char *
 
-/* Gethbadd_alen_t:
+/* Netdb_hlen_t:
  *	This symbol holds the type used for the 2nd argument
  *	to gethostbyaddr().
  */
-#define Gethbadd_alen_t		int
+#define Netdb_hlen_t		int
 
-/* HAS_GETNBADD:
+/* HAS_GETHOSTBYNAME:
+ *	This symbol, if defined, indicates that the gethostbyname routine is
+ *	available to lookup hosts by their DNS names.
+ */
+#define HAS_GETHOSTBYNAME		/**/
+
+/* Netdb_name_t:
+ *	This symbol holds the type used for the 1st argument
+ *	to gethostbyname(), the 1st argument to getnetbyname(),
+ *	the 1st argument to getprotobyname(), the 1st argument to
+ *	getservbyname(), the 2nd argument to getservbyname(),
+ *	and the 2nd argument to getservbyport().
+ */
+#define Netdb_name_t		char *
+
+/* HAS_GETNETBYADD:
  *	This symbol, if defined, indicates that the getnetbyaddr routine is
  *	available to lookup networks by their IP addresses.
  */
-/*#define HAS_GETNBADD		/**/
+/*#define HAS_GETNETBYADD		/**/
 
-/* Gethbadd_net_t:
+/* Netdb_net_t:
  *	This symbol holds the type used for the 1st argument
  *	to getnetbyaddr().
  */
-#define Getnbadd_net_t		long
+#define Netdb_net_t		long
+
+/* HAS_GETNETBYNAME:
+ *	This symbol, if defined, indicates that the getnetbyname routine is
+ *	available to lookup networks by their names.
+ */
+/*#define HAS_GETNETBYNAME		/**/
+
+/* HAS_GETPROTOBYNAME:
+ *	This symbol, if defined, indicates that the getprotobyname routine is
+ *	available to lookup protocols by their names.
+ */
+#define HAS_GETPROTOBYNAME		/**/
+
+/* HAS_GETPROTOBYNUMBER:
+ *	This symbol, if defined, indicates that the getprotobynumber routine is
+ *	available to lookup protocols by their numbers.
+ */
+#define HAS_GETPROTOBYNUMBER		/**/
+
+/* HAS_GETSERVBYNAME:
+ *	This symbol, if defined, indicates that the getservbyname routine is
+ *	available to lookup services by their names.
+ */
+#define HAS_GETSERVBYNAME		/**/
+
+/* HAS_GETSERVBYPORT:
+ *	This symbol, if defined, indicates that the getservbyport routine is
+ *	available to lookup services by their ports.
+ */
+#define HAS_GETSERVBYPORT		/**/
 
 /* HAS_UNAME:
  *	This symbol, if defined, indicates that the C program may use the
@@ -548,6 +593,12 @@
  */
 /*#define HAS_POLL		/**/
 
+/* HAS_PTHREAD_YIELD:
+ *	This symbol, if defined, indicates that the pthread_yield routine is
+ *	available to yield the execution of the current thread.
+ */
+#undef HAS_PTHREAD_YIELD
+
 /* HAS_READDIR:
  *	This symbol, if defined, indicates that the readdir routine is
  *	available to read directory entries. You may have to include
@@ -555,6 +606,12 @@
  */
 #define HAS_READDIR		/**/
 
+/* HAS_SCHED_YIELD:
+ *	This symbol, if defined, indicates that the sched_yield
+ *	routine is available to yield the execution of the current thread.
+ */
+#undef HAS_SCHED_YIELD
+
 /* HAS_SEEKDIR:
  *	This symbol, if defined, indicates that the seekdir routine is
  *	available. You may have to include <dirent.h>. See I_DIRENT.
@@ -1466,7 +1523,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\\lib\\MSWin32-x86-thread"		/**/
+#define ARCHLIB "c:\\perl\\lib\\MSWin32-x86"		/**/
 #define ARCHLIB_EXP (win32_perllib_path(ARCHNAME,NULL))	/**/
 
 /* BINCOMPAT3:
@@ -1606,6 +1663,12 @@
  */
 /*#define	USE_SFIO		/**/
 
+/* PTHREADS_CREATED_JOINABLE:
+ *	This symbol, if defined, indicates that pthreads are created
+ *	in the joinable (aka undetached) state.
+ */
+/*#define	PTHREADS_CREATED_JOINABLE		/**/
+
 /* Sigjmp_buf:
  *	This is the buffer type to be used with Sigsetjmp and Siglongjmp.
  */
@@ -1769,7 +1832,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\\lib\\site"		/**/
+#define SITEARCH "c:\\perl\\lib\\site\\MSWin32-x86"		/**/
 #define SITEARCH_EXP (win32_perllib_path("site",ARCHNAME,NULL))	/**/
 
 /* SITELIB:
@@ -1829,6 +1892,3 @@
 
 #endif
 #include <win32.h>
-#ifndef DEBUGGING
-#define DEBUGGING
-#endif
diff --git a/win32/makedef.pl b/win32/makedef.pl
index 46e4374838..a7037ede85 100644
--- a/win32/makedef.pl
+++ b/win32/makedef.pl
@@ -79,12 +79,6 @@ Perl_chsize
 Perl_ck_aelem
 Perl_cryptseen
 Perl_cx_dump
-Perl_deb
-Perl_deb_growlevel
-Perl_debop
-Perl_debprofdump
-Perl_debstack
-Perl_debstackptrs
 Perl_do_ipcctl
 Perl_do_ipcget
 Perl_do_msgrcv
@@ -164,7 +158,6 @@ Perl_timesbuf
 Perl_too_few_arguments
 Perl_too_many_arguments
 Perl_unlnk
-Perl_wait4pid
 Perl_watch
 Perl_yyname
 Perl_yyrule
@@ -275,6 +268,12 @@ if ($define{'PERL_GLOBAL_STRUCT'})
 unless ($define{'DEBUGGING'})
  {
   skip_symbols [qw(
+    Perl_deb
+    Perl_deb_growlevel
+    Perl_debop
+    Perl_debprofdump
+    Perl_debstack
+    Perl_debstackptrs
     Perl_runops_debug
     Perl_sv_peek
     Perl_watchaddr