apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r892162 - in /apr/apr/trunk/include: apr.h.in apr.hw
Date Fri, 18 Dec 2009 07:24:48 GMT
Author: wrowe
Date: Fri Dec 18 07:24:46 2009
New Revision: 892162

URL: http://svn.apache.org/viewvc?rev=892162&view=rev
Log:
further win32 synchronization

Modified:
    apr/apr/trunk/include/apr.h.in
    apr/apr/trunk/include/apr.hw

Modified: apr/apr/trunk/include/apr.h.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.h.in?rev=892162&r1=892161&r2=892162&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.h.in (original)
+++ apr/apr/trunk/include/apr.h.in Fri Dec 18 07:24:46 2009
@@ -561,19 +561,6 @@
 
 /** @} */
 
-/* Definitions that only Win32 programs need to compile properly. */
-
-/* XXX These simply don't belong here, perhaps in apr_portable.h
- * based on some APR_HAVE_PID/GID/UID?
- */
-#ifdef __MINGW32__
-#ifndef __GNUC__
-typedef  int         pid_t;
-#endif
-typedef  int         uid_t;
-typedef  int         gid_t;
-#endif
-
 /*
  * we always have SDBM (it's in our codebase)
  */
@@ -601,6 +588,19 @@
 #define APU_HAVE_ICONV         @have_iconv@
 #define APR_HAS_XLATE          (APU_HAVE_ICONV)
 
+/* Definitions that only Win32 programs need to compile properly. */
+
+/* XXX These simply don't belong here, perhaps in apr_portable.h
+ * based on some APR_HAVE_PID/GID/UID?
+ */
+#ifdef WIN32
+#ifndef __GNUC__
+typedef  int         pid_t;
+#endif
+typedef  int         uid_t;
+typedef  int         gid_t;
+#endif
+
 #ifdef __cplusplus
 }
 #endif

Modified: apr/apr/trunk/include/apr.hw
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.hw?rev=892162&r1=892161&r2=892162&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.hw (original)
+++ apr/apr/trunk/include/apr.hw Fri Dec 18 07:24:46 2009
@@ -113,14 +113,14 @@
 #endif
 
 #define APR_HAVE_ARPA_INET_H    0
-#define APR_HAVE_CONIO_H        APR_NOT_IN_WCE
+#define APR_HAVE_CONIO_H         APR_NOT_IN_WCE
 #define APR_HAVE_CRYPT_H        0
-#define APR_HAVE_CTYPE_H        APR_NOT_IN_WCE
+#define APR_HAVE_CTYPE_H         APR_NOT_IN_WCE
 #define APR_HAVE_DIRENT_H       0
-#define APR_HAVE_ERRNO_H        APR_NOT_IN_WCE
-#define APR_HAVE_FCNTL_H        APR_NOT_IN_WCE
-#define APR_HAVE_IO_H           APR_NOT_IN_WCE
-#define APR_HAVE_LIMITS_H       APR_NOT_IN_WCE
+#define APR_HAVE_ERRNO_H         APR_NOT_IN_WCE
+#define APR_HAVE_FCNTL_H         APR_NOT_IN_WCE
+#define APR_HAVE_IO_H            APR_NOT_IN_WCE
+#define APR_HAVE_LIMITS_H        APR_NOT_IN_WCE
 #define APR_HAVE_NETDB_H        0
 #define APR_HAVE_NETINET_IN_H   0
 #define APR_HAVE_NETINET_SCTP_H 0
@@ -128,13 +128,13 @@
 #define APR_HAVE_NETINET_TCP_H  0
 #define APR_HAVE_PTHREAD_H      0
 #define APR_HAVE_SEMAPHORE_H    0
-#define APR_HAVE_SIGNAL_H       APR_NOT_IN_WCE
-#define APR_HAVE_STDARG_H       APR_NOT_IN_WCE
-#define APR_HAVE_STDDEF_H       APR_NOT_IN_WCE
+#define APR_HAVE_SIGNAL_H        APR_NOT_IN_WCE
+#define APR_HAVE_STDARG_H        APR_NOT_IN_WCE
+#define APR_HAVE_STDDEF_H        APR_NOT_IN_WCE
 #define APR_HAVE_STDINT_H       0
-#define APR_HAVE_STDIO_H        1
-#define APR_HAVE_STDLIB_H       1
-#define APR_HAVE_STRING_H       1
+#define APR_HAVE_STDIO_H         1
+#define APR_HAVE_STDLIB_H        1
+#define APR_HAVE_STRING_H        1
 #define APR_HAVE_STRINGS_H      0
 #define APR_HAVE_SYS_IOCTL_H    0
 #define APR_HAVE_SYS_SENDFILE_H 0
@@ -143,14 +143,14 @@
 #define APR_HAVE_SYS_SOCKIO_H   0
 #define APR_HAVE_SYS_SYSLIMITS_H 0
 #define APR_HAVE_SYS_TIME_H     0
-#define APR_HAVE_SYS_TYPES_H    APR_NOT_IN_WCE
+#define APR_HAVE_SYS_TYPES_H     APR_NOT_IN_WCE
 #define APR_HAVE_SYS_UIO_H      0
 #define APR_HAVE_SYS_UN_H       0
 #define APR_HAVE_SYS_WAIT_H     0
-#define APR_HAVE_TIME_H         APR_NOT_IN_WCE
+#define APR_HAVE_TIME_H          APR_NOT_IN_WCE
 #define APR_HAVE_UNISTD_H       0
-#define APR_HAVE_WINDOWS_H      1
-#define APR_HAVE_WINSOCK2_H     APR_NOT_IN_WCE
+#define APR_HAVE_WINDOWS_H       1
+#define APR_HAVE_WINSOCK2_H      APR_NOT_IN_WCE
 
 /** @} */
 /** @} */
@@ -214,6 +214,10 @@
 #include <sys/socket.h>
 #endif
 
+#if APR_HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+
 #if APR_HAVE_STDINT_H
 #include <stdint.h>
 #endif
@@ -231,19 +235,6 @@
 #endif
 #endif
 
-#if APR_HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#if APR_HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#if APR_HAVE_STDDEF_H
-#include <stddef.h>
-#endif
-#if APR_HAVE_TIME_H
-#include <time.h>
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -271,8 +262,8 @@
 #define APR_USE_SHMEM_BEOS         0
 
 #define APR_USE_FLOCK_SERIALIZE           0 
-#define APR_USE_POSIXSEM_SERIALIZE        0
 #define APR_USE_SYSVSEM_SERIALIZE         0
+#define APR_USE_POSIXSEM_SERIALIZE        0
 #define APR_USE_FCNTL_SERIALIZE           0
 #define APR_USE_PROC_PTHREAD_SERIALIZE    0 
 #define APR_USE_PTHREAD_SERIALIZE         0 
@@ -298,6 +289,7 @@
 #define APR_HAVE_SIGACTION      0
 #define APR_HAVE_SIGSUSPEND     0
 #define APR_HAVE_SIGWAIT        0
+#define APR_HAVE_SA_STORAGE     0
 #define APR_HAVE_STRCASECMP     0
 #define APR_HAVE_STRDUP         1
 #define APR_HAVE_STRICMP        APR_NOT_IN_WCE
@@ -327,7 +319,7 @@
 #define APR_HAS_XTHREAD_FILES     APR_NOT_IN_WCE
 #define APR_HAS_OS_UUID           1
 
-#define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD  APR_NOT_IN_WCE
+#define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD APR_NOT_IN_WCE
 
 /* APR sets APR_FILES_AS_SOCKETS to 1 on systems where it is possible
  * to poll on files/pipes.
@@ -341,7 +333,7 @@
 /* If we have a TCP implementation that can be "corked", what flag
  * do we use?
  */
-#xxxdefine APR_TCP_NOPUSH_FLAG       @apr_tcp_nopush_flag@
+#define APR_TCP_NOPUSH_FLAG       0
 
 /* Is the TCP_NODELAY socket option inherited from listening sockets?
  */
@@ -349,7 +341,7 @@
 
 /* Is the O_NONBLOCK flag inherited from listening sockets?
  */
-#define APR_O_NONBLOCK_INHERITED  1
+#define APR_O_NONBLOCK_INHERITED 1
 
 /* Typedefs that APR needs. */
 
@@ -365,15 +357,11 @@
 typedef  unsigned __int64  apr_uint64_t;
 
 typedef  size_t      apr_size_t;
-#if APR_HAVE_STDDEF_H
-typedef  ptrdiff_t   apr_ssize_t;
-#else
-typedef  int         apr_ssize_t;
-#endif
+typedef  ssize_t     apr_ssize_t;
 #if APR_HAS_LARGE_FILES
 typedef  __int64     apr_off_t;
 #else
-typedef  int         apr_off_t;
+typedef  long        apr_off_t;
 #endif
 typedef  int         apr_socklen_t;
 typedef  apr_uint64_t      apr_ino_t;
@@ -657,11 +645,13 @@
 /* XXX These simply don't belong here, perhaps in apr_portable.h
  * based on some APR_HAVE_PID/GID/UID?
  */
+#ifdef WIN32
 #ifndef __GNUC__
 typedef  int         pid_t;
 #endif
 typedef  int         uid_t;
 typedef  int         gid_t;
+#endif
 
 #if APR_HAVE_IPV6
 



Mime
View raw message