You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2003/01/13 18:57:47 UTC
cvs commit: apr/include apr.hw apr.hnw
wrowe 2003/01/13 09:57:47
Modified: include apr.hw apr.hnw
Log:
Catch up on some new apr.h.in flags for consistency.
Brad, please correct the netware 64 bit flag, if you have some macro
to test on that platform.
Revision Changes Path
1.105 +14 -1 apr/include/apr.hw
Index: apr.hw
===================================================================
RCS file: /home/cvs/apr/include/apr.hw,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- apr.hw 1 Jan 2003 00:01:45 -0000 1.104
+++ apr.hw 13 Jan 2003 17:57:47 -0000 1.105
@@ -108,6 +108,8 @@
#define APR_HAVE_LIMITS_H 1
#define APR_HAVE_NETDB_H 0
#define APR_HAVE_NETINET_IN_H 0
+#define APR_HAVE_NETINET_SCTP_H 0
+#define APR_HAVE_NETINET_SCTP_UIO_H 0
#define APR_HAVE_NETINET_TCP_H 0
#define APR_HAVE_PTHREAD_H 0
#define APR_HAVE_SIGNAL_H 1
@@ -193,7 +195,7 @@
#define APR_HAVE_IN_ADDR 1
#define APR_HAVE_INET_ADDR 1
#define APR_HAVE_INET_NETWORK 0
-#define APR_HAVE_IPV6 0
+#define APR_HAVE_IPV6 1
#define APR_HAVE_MEMMOVE 1
#define APR_HAVE_SETRLIMIT 0
#define APR_HAVE_SIGACTION 0
@@ -206,6 +208,7 @@
#define APR_HAVE_MEMCHR 1
#define APR_HAVE_STRUCT_RLIMIT 0
#define APR_HAVE_UNION_SEMUN 0
+#define APR_HAVE_SCTP 0
#ifndef _WIN32_WCE
#define APR_HAVE_STRICMP 1
@@ -334,6 +337,16 @@
typedef int apr_off_t;
#endif
typedef int apr_socklen_t;
+
+#ifdef WIN64
+#define APR_SIZEOF_VOIDP 8
+#else
+#define APR_SIZEOF_VOIDP 4
+#endif
+
+/* XXX These simply don't belong here, perhaps in apr_portabile.h
+ * based on some APR_HAVE_PID/GID/UID?
+ */
typedef int pid_t;
typedef int uid_t;
typedef int gid_t;
1.26 +8 -1 apr/include/apr.hnw
Index: apr.hnw
===================================================================
RCS file: /home/cvs/apr/include/apr.hnw,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- apr.hnw 2 Jan 2003 23:11:35 -0000 1.25
+++ apr.hnw 13 Jan 2003 17:57:47 -0000 1.26
@@ -108,6 +108,8 @@
#define APR_HAVE_LIMITS_H 1
#define APR_HAVE_NETDB_H 0
#define APR_HAVE_NETINET_IN_H 0
+#define APR_HAVE_NETINET_SCTP_H 0
+#define APR_HAVE_NETINET_SCTP_UIO_H 0
#define APR_HAVE_NETINET_TCP_H 0
#define APR_HAVE_PTHREAD_H 0
#define APR_HAVE_SIGNAL_H 1
@@ -189,7 +191,7 @@
#define APR_HAVE_STRSTR 1
#define APR_HAVE_STRUCT_RLIMIT 0
#define APR_HAVE_UNION_SEMUN 0
-
+#define APR_HAVE_SCTP 0
#if APR_HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -255,6 +257,11 @@
typedef off_t apr_off_t;
typedef int apr_socklen_t;
+#ifdef UNKNOWN_NETWARE_64BIT_FLAG_NEEDED
+#define APR_SIZEOF_VOIDP 8
+#else
+#define APR_SIZEOF_VOIDP 4
+#endif
/* Mechanisms to properly type numeric literals */
Re: cvs commit: apr/include apr.hw apr.hnw
Posted by Branko Čibej <br...@xbc.nu>.
wrowe@apache.org wrote:
>wrowe 2003/01/13 09:57:47
>
> Modified: include apr.hw apr.hnw
> Log:
> Catch up on some new apr.h.in flags for consistency.
>
> Brad, please correct the netware 64 bit flag, if you have some macro
> to test on that platform.
>
> Revision Changes Path
> 1.105 +14 -1 apr/include/apr.hw
>
> Index: apr.hw
> ===================================================================
> RCS file: /home/cvs/apr/include/apr.hw,v
> retrieving revision 1.104
> retrieving revision 1.105
> diff -u -r1.104 -r1.105
>
...
> -#define APR_HAVE_IPV6 0
> +#define APR_HAVE_IPV6 1
>
>
Could we make this particular change conditional on some external
define? From what I understand, IPV6 support is very experimental on
Windows. My July 2002 PSDK isn't recent enough; I don't think we should
be _that_ bleeding-edge.
--
Brane Čibej <br...@xbc.nu> http://www.xbc.nu/brane/