[asperl] integrate win32 branch

p4raw-id: //depot/asperl@527

1 files changed, 59 insertions, 17 deletions

diff --git a/win32/config_H.vc b/win32/config_H.vc
index 4124b6188f..c3b8dc7e07 100644
--- a/win32/config_H.vc
+++ b/win32/config_H.vc
@@ -55,7 +55,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
@@ -319,35 +319,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_GETNETBYADDR:
  *	This symbol, if defined, indicates that the getnetbyaddr routine is
  *	available to lookup networks by their IP addresses.
  */
-/*#define HAS_GETNBADD		/**/
+/*#define HAS_GETNETBYADDR		/**/
 
-/* 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
@@ -1486,7 +1531,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:\\perl5004.5x\\lib"		/**/
+#define ARCHLIB "c:\\perl\\lib\\MSWin32-x86"		/**/
 #define ARCHLIB_EXP (win32_perllib_path(ARCHNAME,NULL))	/**/
 
 /* BINCOMPAT3:
@@ -1797,7 +1842,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:\\perl5004.5x\\lib\\site"		/**/
+#define SITEARCH "c:\\perl\\lib\\site\\MSWin32-x86"		/**/
 #define SITEARCH_EXP (win32_perllib_path("site",ARCHNAME,NULL))	/**/
 
 /* SITELIB:
@@ -1857,6 +1902,3 @@
 
 #endif
 #include <win32.h>
-#ifndef DEBUGGING
-#define DEBUGGING
-#endif