apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r892148 - in /apr/apr/trunk: include/apr.h.in include/apr.hw include/arch/netware/apr_private.h include/arch/win32/apr_private.h include/private/apu_config.hnw include/private/apu_config.hw threadproc/win32/proc.c threadproc/win32/thread.c
Date Fri, 18 Dec 2009 06:10:45 GMT
Author: wrowe
Date: Fri Dec 18 06:10:44 2009
New Revision: 892148

URL: http://svn.apache.org/viewvc?rev=892148&view=rev
Log:
Finish removing apu_config.h[n]w templates, these need synchronization w/unix

Removed:
    apr/apr/trunk/include/private/apu_config.hnw
    apr/apr/trunk/include/private/apu_config.hw
Modified:
    apr/apr/trunk/include/apr.h.in
    apr/apr/trunk/include/apr.hw
    apr/apr/trunk/include/arch/netware/apr_private.h
    apr/apr/trunk/include/arch/win32/apr_private.h
    apr/apr/trunk/threadproc/win32/proc.c
    apr/apr/trunk/threadproc/win32/thread.c

Modified: apr/apr/trunk/include/apr.h.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.h.in?rev=892148&r1=892147&r2=892148&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.h.in (original)
+++ apr/apr/trunk/include/apr.h.in Fri Dec 18 06:10:44 2009
@@ -116,13 +116,49 @@
  */
 
 #if APR_HAVE_WINDOWS_H
+#ifndef _WINDOWS_
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0501
+#endif
+
+#ifndef NOUSER
+#define NOUSER
+#endif
+#ifndef NOMCX
+#define NOMCX
+#endif
+#ifndef NOIME
+#define NOIME
+#endif
+
 #include <windows.h>
 #endif
+#endif
 
 #if APR_HAVE_WINSOCK2_H
 #include <winsock2.h>
+
+#if APR_HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+
+#if APR_HAVE_MSWSOCK_H
+#include <mswsock.h>
 #endif
 
+#else /* !APR_HAVE_WINSOCK2_H */
+
+#if APR_HAVE_WINSOCK_H
+#include <winsock.h>
+#endif
+
+#endif /* !APR_HAVE_WINSOCK2_H */
+
 #if APR_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif

Modified: apr/apr/trunk/include/apr.hw
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.hw?rev=892148&r1=892147&r2=892148&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.hw (original)
+++ apr/apr/trunk/include/apr.hw Fri Dec 18 06:10:44 2009
@@ -28,16 +28,6 @@
  * apr.hw by the apr.dsp and libapr.dsp projects. 
  */
 
-/**
- * @file apr.h
- * @brief APR Platform Definitions
- * @remark This is a generated header generated from include/apr.h.in by
- * ./configure, or copied from include/apr.hw or include/apr.hnw 
- * for Win32 or Netware by those build environments, respectively.
- */
-
-#if defined(WIN32) || defined(DOXYGEN)
-
 /* Ignore most warnings (back down to /W3) for poorly constructed headers
  */
 #if defined(_MSC_VER) && _MSC_VER >= 1200
@@ -66,44 +56,13 @@
 #pragma warning(disable: 4996)
 #endif
 
-/* Has windows.h already been included?  If so, our preferences don't matter,
- * but we will still need the winsock things no matter what was included.
- * If not, include a restricted set of windows headers to our tastes.
- */
-#ifndef _WINDOWS_
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#ifndef _WIN32_WINNT
-
-/* Restrict the server to a subset of Windows XP header files by default
- */
-#define _WIN32_WINNT 0x0501
-#endif
-#ifndef NOUSER
-#define NOUSER
-#endif
-#ifndef NOMCX
-#define NOMCX
-#endif
-#ifndef NOIME
-#define NOIME
-#endif
-#include <windows.h>
-/* 
- * Add a _very_few_ declarations missing from the restricted set of headers
- * (If this list becomes extensive, re-enable the required headers above!)
- * winsock headers were excluded by WIN32_LEAN_AND_MEAN, so include them now
+/**
+ * @file apr.h
+ * @brief APR Platform Definitions
+ * @remark This is a generated header generated from include/apr.h.in by
+ * ./configure, or copied from include/apr.hw or include/apr.hnw 
+ * for Win32 or Netware by those build environments, respectively.
  */
-#define SW_HIDE             0
-#ifndef _WIN32_WCE
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <mswsock.h>
-#else
-#include <winsock.h>
-#endif
-#endif /* !_WINDOWS_ */
 
 /**
  * @defgroup APR Apache Portability Runtime library
@@ -142,6 +101,7 @@
 #define APR_HAVE_SEMAPHORE_H    0
 #define APR_HAVE_SIGNAL_H       1
 #define APR_HAVE_STDARG_H       1
+#define APR_HAVE_STDDEF_H       1
 #define APR_HAVE_STDINT_H       0
 #define APR_HAVE_STDIO_H        1
 #define APR_HAVE_STDLIB_H       1
@@ -160,8 +120,8 @@
 #define APR_HAVE_SYS_WAIT_H     0
 #define APR_HAVE_TIME_H         1
 #define APR_HAVE_UNISTD_H       0
-#define APR_HAVE_STDDEF_H       1
-#define APR_HAVE_PROCESS_H      1
+#define APR_HAVE_WINDOWS_H      1
+#define APR_HAVE_WINSOCK2_H     1
 #else
 #define APR_HAVE_ARPA_INET_H    0
 #define APR_HAVE_CONIO_H        0
@@ -181,6 +141,7 @@
 #define APR_HAVE_SEMAPHORE_H    0
 #define APR_HAVE_SIGNAL_H       0
 #define APR_HAVE_STDARG_H       0
+#define APR_HAVE_STDDEF_H       0
 #define APR_HAVE_STDINT_H       0
 #define APR_HAVE_STDIO_H        1
 #define APR_HAVE_STDLIB_H       1
@@ -199,8 +160,8 @@
 #define APR_HAVE_SYS_WAIT_H     0
 #define APR_HAVE_TIME_H         0
 #define APR_HAVE_UNISTD_H       0
-#define APR_HAVE_STDDEF_H       0
-#define APR_HAVE_PROCESS_H      0
+#define APR_HAVE_WINDOWS_H      1
+#define APR_HAVE_WINSOCK2_H     0
 #endif
 
 /** @} */
@@ -210,24 +171,90 @@
  * or the extern "C" namespace 
  */
 
+/* If windows.h was already included, our preferences don't matter.
+ * If not, include a restricted set of windows headers to our tastes.
+ */
+#if APR_HAVE_WINDOWS_H
+#ifndef _WINDOWS_
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0501
+#endif
+
+#ifndef NOUSER
+#define NOUSER
+#endif
+#ifndef NOMCX
+#define NOMCX
+#endif
+#ifndef NOIME
+#define NOIME
+#endif
+
+#include <windows.h>
+#endif
+#endif
+
+#if APR_HAVE_WINSOCK2_H
+#include <winsock2.h>
+
+#if APR_HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+
+#if APR_HAVE_MSWSOCK_H
+#include <mswsock.h>
+#endif
+
+#else /* !APR_HAVE_WINSOCK2_H */
+
+#if APR_HAVE_WINSOCK_H
+#include <winsock.h>
+#endif
+
+#endif /* !APR_HAVE_WINSOCK2_H */
+
+#if APR_HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#if APR_HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+#if APR_HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#if APR_HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+
+/* header files for PATH_MAX, _POSIX_PATH_MAX */
+#if APR_HAVE_LIMITS_H
+#include <limits.h>
+#else
+#if APR_HAVE_SYS_SYSLIMITS_H
+#include <sys/syslimits.h>
+#endif
+#endif
+
 #if APR_HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
 #if APR_HAVE_STDIO_H
 #include <stdio.h>
 #endif
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #if APR_HAVE_STDDEF_H
 #include <stddef.h>
 #endif
 #if APR_HAVE_TIME_H
 #include <time.h>
 #endif
-#if APR_HAVE_PROCESS_H
-#include <process.h>
-#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -686,13 +713,13 @@
 }
 #endif
 
-/* Done with badly written headers
+/* Done with badly written headers, leave 'deprecated CRT' undeprecated
  */
 #if defined(_MSC_VER) && _MSC_VER >= 1200
 #pragma warning(pop)
+#if _MSC_VER >= 1400
 #pragma warning(disable: 4996)
 #endif
-
-#endif /* WIN32 */
+#endif
 
 #endif /* APR_H */

Modified: apr/apr/trunk/include/arch/netware/apr_private.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/arch/netware/apr_private.h?rev=892148&r1=892147&r2=892148&view=diff
==============================================================================
--- apr/apr/trunk/include/arch/netware/apr_private.h (original)
+++ apr/apr/trunk/include/arch/netware/apr_private.h Fri Dec 18 06:10:44 2009
@@ -169,4 +169,28 @@
 /* used to check DWORD overflow for 64bit compiles */
 #define APR_DWORD_MAX 0xFFFFFFFFUL
 
+/* Always compile Netware with DSO support for .nlm builds */
+#define APU_DSO_BUILD           0
+
+/*
+ * NetWare does not have GDBM, and we always use the bundled (new) Expat
+ */
+
+/* Define if you have the gdbm library (-lgdbm). */
+/* #undef HAVE_LIBGDBM */
+
+/* define if Expat 1.0 or 1.1 was found */
+/* #undef APR_HAVE_OLD_EXPAT */
+
+/* NetWare uses its own ICONV implementation. */
+#define HAVE_ICONV_H 1
+
+/*
+ * check for newer NDKs which use now correctly 'const char*' with iconv.
+ */
+#include <ndkvers.h>
+#if (CURRENT_NDK_THRESHOLD >= 705110000)
+#define APU_ICONV_INBUF_CONST
+#endif
+
 #endif  /*APR_PRIVATE_H*/

Modified: apr/apr/trunk/include/arch/win32/apr_private.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/arch/win32/apr_private.h?rev=892148&r1=892147&r2=892148&view=diff
==============================================================================
--- apr/apr/trunk/include/arch/win32/apr_private.h (original)
+++ apr/apr/trunk/include/arch/win32/apr_private.h Fri Dec 18 06:10:44 2009
@@ -16,12 +16,10 @@
 
 /*
  * Note: 
- * This is the windows specific autoconf-like config file
- * which unix would create at build time.
+ * This is the win32-specific autoconf-like config file
+ * which unix creates at ./configure time.
  */
 
-#ifdef WIN32
-
 #ifndef APR_PRIVATE_H
 #define APR_PRIVATE_H
 
@@ -32,8 +30,8 @@
 
 /* 
  * Add a _very_few_ declarations missing from the restricted set of headers
- * (If this list becomes extensive, re-enable the required headers above!)
- * winsock headers were excluded by WIN32_LEAN_AND_MEAN, so include them now
+ * (If this list becomes extensive, re-enable the required headers in apr.hw!)
+ * ACL headers were excluded by default, so include them now.
  */
 #ifndef SW_HIDE
 #define SW_HIDE             0
@@ -56,26 +54,19 @@
 #define HAVE_ACLAPI 0
 #endif
 
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if APR_HAVE_STDDEF_H
-#include <stddef.h>
-#endif
-#include <stdio.h>
-#if APR_HAVE_TIME_H
-#include <time.h>
-#endif
-
 /* Use this section to define all of the HAVE_FOO_H
  * that are required to build properly.
  */
 #define HAVE_LIMITS_H 1
 #define HAVE_MALLOC_H 1
 #define HAVE_SIGNAL_H 1
-/* #define HAVE_STDDEF_H 1 why not? */
 #define HAVE_STDLIB_H 1
 
+#ifndef _WIN32_WCE
+#define HAVE_PROCESS_H 1
+#define HAVE_STDDEF_H 1
+#endif
+
 #define HAVE_STRICMP  1
 #define HAVE_STRNICMP 1
 #define HAVE_STRDUP   1
@@ -164,5 +155,38 @@
 /* used to check for DWORD overflow in 64bit compiles */
 #define APR_DWORD_MAX 0xFFFFFFFFUL
 
+/* Compile win32 with DSO support for .dll builds
+ * Pair the static xml build for static apr-2.lib
+ */
+#ifdef APR_DECLARE_STATIC
+#define APU_DSO_BUILD           0
+#define XML_STATIC              1
+#else
+#define APU_DSO_BUILD           1
+#endif
+
+/* Presume a standard, modern (5.x) mysql sdk/
+#define HAVE_MY_GLOBAL_H        1
+
+/* my_sys.h is broken on VC/Win32, and apparently not required */
+/* #undef HAVE_MY_SYS_H           0 */
+
+/* Windows ODBC sql.h is always present */
+#define HAVE_SQL_H              1
+
+/*
+ * Windows does not have GDBM, and we always use the bundled (new) Expat
+ */
+
+/* Define if you have the gdbm library (-lgdbm).  */
+/* #undef HAVE_LIBGDBM */
+
+/* define if Expat 1.0 or 1.1 was found */
+/* #undef APR_HAVE_OLD_EXPAT */
+
+#ifdef HAVE_PROCESS_H
+#include <process.h>
+#endif
+
 #endif  /*APR_PRIVATE_H*/
 #endif  /*WIN32*/

Modified: apr/apr/trunk/threadproc/win32/proc.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/threadproc/win32/proc.c?rev=892148&r1=892147&r2=892148&view=diff
==============================================================================
--- apr/apr/trunk/threadproc/win32/proc.c (original)
+++ apr/apr/trunk/threadproc/win32/proc.c Fri Dec 18 06:10:44 2009
@@ -28,7 +28,7 @@
 #include <signal.h>
 #endif
 #include <string.h>
-#if APR_HAVE_PROCESS_H
+#ifdef HAVE_PROCESS_H
 #include <process.h>
 #endif
 

Modified: apr/apr/trunk/threadproc/win32/thread.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/threadproc/win32/thread.c?rev=892148&r1=892147&r2=892148&view=diff
==============================================================================
--- apr/apr/trunk/threadproc/win32/thread.c (original)
+++ apr/apr/trunk/threadproc/win32/thread.c Fri Dec 18 06:10:44 2009
@@ -20,7 +20,7 @@
 #include "apr_general.h"
 #include "apr_lib.h"
 #include "apr_portable.h"
-#if APR_HAVE_PROCESS_H
+#ifdef HAVE_PROCESS_H
 #include <process.h>
 #endif
 #include "apr_arch_misc.h"   



Mime
View raw message