wrowe 2002/10/12 20:37:21
Modified: include apr.hw
Log:
Well MS got around to getting it right, after some fashion.
This is also conditional on old includes. And we cannot
exclude GDI declarations since the aclapi stuff depends on
GDI declarations as well.
Revision Changes Path
1.102 +3 -5 apr/include/apr.hw
Index: apr.hw
===================================================================
RCS file: /home/cvs/apr/include/apr.hw,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- apr.hw 12 Oct 2002 05:29:19 -0000 1.101
+++ apr.hw 13 Oct 2002 03:37:21 -0000 1.102
@@ -232,9 +232,6 @@
#ifndef NOUSER
#define NOUSER
#endif
-#ifndef NOGDI
-#define NOGDI
-#endif
#ifndef NOMCX
#define NOMCX
#endif
@@ -349,10 +346,11 @@
#if APR_HAVE_IPV6
#include <ws2tcpip.h>
-/* Win32 does it's own thing. Again. */
+/* Appears in later flavors, not the originals. */
+#ifndef in_addr6
#define in6_addr in_addr6
+#endif
-/* Appears in later flavors, not the originals. */
#ifndef WS2TCPIP_INLINE
#define IN6_IS_ADDR_V4MAPPED(a) \
( (*(const apr_uint64_t *)(const void *)(&(a)->s6_addr[0]) == 0) \
