wrowe 02/01/28 23:11:25
Modified: include/arch/win32 apr_private.h
include apr.hw
Log:
Continued WinCE porting efforts
Submitted by: Mladen Turk <[EMAIL PROTECTED]>CVS:
----------------------------------------------------------------------CVS:
PR:CVS: If this change addresses a PR in the problem report trackingCVS:
database, then enter the PR number(s) here.CVS: Obtained from:CVS: If this
change has been taken from another system, such as NCSA,CVS: then name the
system in this line, otherwise delete it.CVS: Submitted by:CVS: If this code
has been contributed to Apache by someone else; i.e.,CVS: they sent us a
patch or a new module, then include their name/emailCVS: address here. If
this is your work then delete this line.CVS: Reviewed by:CVS: If we are doing
pre-commit code reviews and someone else hasCVS: reviewed your changes,
include their name(s) here.CVS: If you have not had it reviewed then delete
this line.CVS:
----------------------------------------------------------------------
Revision Changes Path
1.29 +8 -0 apr/include/arch/win32/apr_private.h
Index: apr_private.h
===================================================================
RCS file: /home/cvs/apr/include/arch/win32/apr_private.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- apr_private.h 24 Nov 2001 16:59:09 -0000 1.28
+++ apr_private.h 29 Jan 2002 07:11:25 -0000 1.29
@@ -81,6 +81,7 @@
* Avoid dragging in wtypes.h unless it's absolutely necessary [generally
* not with APR itself, until some GUI-related security is introduced.]
*/
+#ifndef _WIN32_WCE
#ifdef __wtypes_h__
#include <accctrl.h>
#else
@@ -88,11 +89,18 @@
#include <accctrl.h>
#undef __wtypes_h__
#endif
+#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.
1.85 +65 -4 apr/include/apr.hw
Index: apr.hw
===================================================================
RCS file: /home/cvs/apr/include/apr.hw,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- apr.hw 28 Jan 2002 19:35:25 -0000 1.84
+++ apr.hw 29 Jan 2002 07:11:25 -0000 1.85
@@ -87,11 +87,12 @@
#pragma warning(disable: 4100 4127 4201 4514; once: 4057 4075 4244)
#define APR_INLINE __inline
-#define APR_HAS_INLINE 1
+#define APR_HAS_INLINE 1
#define __attribute__(__x)
#define NO_USE_SIGACTION
+#ifndef _WIN32_WCE
#define APR_HAVE_ARPA_INET_H 0
#define APR_HAVE_CONIO_H 1
#define APR_HAVE_CRYPT_H 0
@@ -121,6 +122,43 @@
#define APR_HAVE_SYS_UIO_H 0
#define APR_HAVE_SYS_WAIT_H 0
#define APR_HAVE_UNISTD_H 0
+#define APR_HAVE_STDDEF_H 1
+#define APR_HAVE_PROCESS_H 1
+#define APR_HAVE_TIME_H 1
+#else
+#define APR_HAVE_ARPA_INET_H 0
+#define APR_HAVE_CONIO_H 1
+#define APR_HAVE_CRYPT_H 0
+#define APR_HAVE_CTYPE_H 0
+#define APR_HAVE_DIRENT_H 0
+#define APR_HAVE_ERRNO_H 0
+#define APR_HAVE_FCNTL_H 0
+#define APR_HAVE_IO_H 0
+#define APR_HAVE_LIMITS_H 0
+#define APR_HAVE_NETDB_H 0
+#define APR_HAVE_NETINET_IN_H 0
+#define APR_HAVE_NETINET_TCP_H 0
+#define APR_HAVE_PTHREAD_H 0
+#define APR_HAVE_SIGNAL_H 0
+#define APR_HAVE_STDARG_H 0
+#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_STRINGS_H 0
+#define APR_HAVE_SYS_SENDFILE_H 0
+#define APR_HAVE_SYS_SIGNAL_H 0
+#define APR_HAVE_SYS_SOCKET_H 0
+#define APR_HAVE_SYS_SYSLIMITS_H 0
+#define APR_HAVE_SYS_TIME_H 0
+#define APR_HAVE_SYS_TYPES_H 0
+#define APR_HAVE_SYS_UIO_H 0
+#define APR_HAVE_SYS_WAIT_H 0
+#define APR_HAVE_UNISTD_H 0
+#define APR_HAVE_STDDEF_H 0
+#define APR_HAVE_PROCESS_H 0
+#define APR_HAVE_TIME_H 0
+#endif
#define APR_USE_FLOCK_SERIALIZE 0
#define APR_USE_SYSVSEM_SERIALIZE 0
@@ -145,10 +183,10 @@
#define APR_FILE_BASED_SHM 0
#define APR_MEM_BASED_SHM 0
-#define APR_HAVE_CORKABLE_TCP 0
+#define APR_HAVE_CORKABLE_TCP 0
#define APR_HAVE_GETRLIMIT 0
#define APR_HAVE_IN_ADDR 1
-#define APR_HAVE_INET_ADDR 1
+#define APR_HAVE_INET_ADDR 1
#define APR_HAVE_INET_NETWORK 0
#define APR_HAVE_IPV6 0
#define APR_HAVE_MEMMOVE 1
@@ -199,8 +237,12 @@
* winsock headers were excluded by WIN32_LEAN_AND_MEAN, so include them now
*/
#define SW_HIDE 0
+#ifndef _WIN32_WCE
#include <winsock2.h>
#include <mswsock.h>
+#else
+#include <winsock.h>
+#endif
#endif /* !_WINDOWS_ */
#if APR_HAVE_STDLIB_H
@@ -212,10 +254,15 @@
#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
/* APR Feature Macros */
#define APR_HAS_SHARED_MEMORY 1
@@ -229,9 +276,15 @@
#define APR_HAS_DSO 1
#define APR_HAS_SO_ACCEPTFILTER 0
#define APR_HAS_UNICODE_FS 1
+#ifndef _WIN32_WCE
#define APR_HAS_USER 1
#define APR_HAS_LARGE_FILES 1
#define APR_HAS_XTHREAD_FILES 1
+#else
+#define APR_HAS_USER 0
+#define APR_HAS_LARGE_FILES 0
+#define APR_HAS_XTHREAD_FILES 0
+#endif
/* Not all platforms have a real INADDR_NONE. This macro replaces
INADDR_NONE
* on all platforms.
@@ -256,8 +309,16 @@
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
+#if APR_HAS_LARGE_FILES
typedef __int64 apr_off_t;
+#else
+typedef int apr_off_t;
+#endif
typedef int apr_socklen_t;
typedef int pid_t;
typedef int uid_t;
