apr.hnw.patch: -------------- ../srclib/apr/time/unix/time.c: In function `apr_ansi_time_to_apr_time': ../srclib/apr/time/unix/time.c:103: invalid suffix on integer constant ../srclib/apr/time/unix/time.c: In function `explode_time': ../srclib/apr/time/unix/time.c:126: invalid suffix on integer constant ../srclib/apr/time/unix/time.c:127: invalid suffix on integer constant ../srclib/apr/time/unix/time.c: In function `apr_implode_time': ../srclib/apr/time/unix/time.c:204: invalid suffix on integer constant ../srclib/apr/time/unix/time.c: In function `apr_implode_gmt': ../srclib/apr/time/unix/time.c:212: invalid suffix on integer constant ../srclib/apr/time/unix/time.c: In function `apr_os_imp_time_get': ../srclib/apr/time/unix/time.c:219: invalid suffix on integer constant ../srclib/apr/time/unix/time.c:220: invalid suffix on integer constant ../srclib/apr/time/unix/time.c: In function `apr_os_imp_time_put': ../srclib/apr/time/unix/time.c:247: invalid suffix on integer constant ../srclib/apr/time/unix/time.c: In function `apr_unix_setup_time': ../srclib/apr/time/unix/time.c:339: warning: implicit declaration of function `gettimeofday' MAKE: *** [../srclib/apr/time/unix/time.o] Error 1
In file included from
../../srclib/apr/include/arch/netware/apr_private.h:69,
from ../../srclib/apr/include/arch/netware/dso.h:58,from ../../srclib/apr/dso/netware/dso.c:55:
../../srclib/apr/include/apr.h:90: WS2NLM.h: No such file or directory
make: *** [../../srclib/apr/dso/netware/dso.d] Error 1
Note: #define APR_INT64_C(val) (val##i64) - if it is really needed by
CodeWarrior, I suggest to use some #ifdef conditional directive here. Watcom is also not familiar with this changed definition of APR_INT64_C().
apr_general.h.patch: -------------------- Watcom C32 Optimizing Compiler Version 11.0c
Copyright by Sybase, Inc., and its subsidiaries, 1984, 2000.
All rights reserved. Watcom is a trademark of Sybase, Inc.
..\..\srclib\apr\include\apr_general.h(87): Error! E1100: Definition of macro 'MAXIMUM_WAIT_OBJECTS' not identical to previous definition
Note: Warning only generated by gcc.
networkio.h.patch: -------------------------------------------- In file included from ../../srclib/apr/network_io/unix/inet_pton.c:18:
../../srclib/apr/include/arch/netware/networkio.h:62: ..\win32\networkio.h: No such file or directory
make: *** [../../srclib/apr/network_io/unix/inet_pton.d] Error 1
thread.c.patch: --------------- ../../srclib/apr/threadproc/netware/thread.c: In function `apr_thread_create': ../../srclib/apr/threadproc/netware/thread.c:113: warning: repeated `0' flag in format
../../srclib/apr/threadproc/netware/thread.c:113: warning: repeated `0' flag in format
../../srclib/apr/threadproc/netware/thread.c:113: warning: long int format, int arg (arg 3)
Note: It's only warning, not a critical problem.
time.c.patch: ------------- .../nlmstuff/bin/nlmconv.exe: warning: symbol gettimeofday imported but not in import list
Thanks, Pavel
--- original/srclib/apr/include/apr.hnw Tue Nov 20 00:20:52 2001 +++ modified/srclib/apr/include/apr.hnw Sat Dec 8 01:22:32 2001 @@ -87,7 +87,7 @@ #include <signal.h> -#include <WS2NLM.h> +#include <ws2nlm.h> #define _POSIX_THREAD_SAFE_FUNCTIONS 1 #define READDIR_IS_THREAD_SAFE 1 @@ -221,7 +221,7 @@ /* Mechanisms to properly type numeric literals */ -#define APR_INT64_C(val) (val##i64) +#define APR_INT64_C(val) (val) //srj added in here, libc c no longer takes care of these
--- original/srclib/apr/include/apr_general.h Sat Aug 25 00:18:14 2001 +++ modified/srclib/apr/include/apr_general.h Sat Dec 8 01:42:42 2001 @@ -83,7 +83,9 @@ #define TRUE (!FALSE) #endif +#ifndef MAXIMUM_WAIT_OBJECTS #define MAXIMUM_WAIT_OBJECTS 64 +#endif #define APR_ASCII_BLANK '\040' #define APR_ASCII_CR '\015'
--- original/srclib/apr/include/arch/netware/networkio.h Mon Aug 27
21:11:04 2001
+++ modified/srclib/apr/include/arch/netware/networkio.h Sat Dec 8
01:39:34 2001
@@ -59,7 +59,7 @@
arch/netware and then arch/unix. But in this specific case we
want arch/win32.
*/
-#include <..\win32\networkio.h>
+#include <../win32/networkio.h>
#endif /* ! NETWORK_IO_H */
--- original/srclib/apr/threadproc/netware/thread.c Sat Dec 1 00:20:44 2001
+++ modified/srclib/apr/threadproc/netware/thread.c Sat Dec 8 02:00:26 2001
@@ -110,7 +110,7 @@
strncpy (threadName, attr->thread_name, NX_MAX_OBJECT_NAME_LEN);
}
else {
- sprintf(threadName, "APR_thread %0004ld", ++thread_count);
+ sprintf(threadName, "APR_thread %04ld", ++thread_count);
}
/* An original stack size of 0 will allow NXCreateThread() to
--- original/srclib/apr/time/unix/time.c Tue Nov 6 00:20:36 2001
+++ modified/srclib/apr/time/unix/time.c Fri Dec 7 00:07:34 2001
@@ -305,6 +305,7 @@
}
#endif
+#ifndef NETWARE
APR_DECLARE(void) apr_unix_setup_time(void)
{
#if !defined(HAVE_GMTOFF) && !defined(HAVE___OFFSET)
@@ -351,6 +352,7 @@
server_gmt_offset = (apr_int32_t) difftime(t1, t2) + (was_dst ? 3600 : 0);
#endif
}
+#endif
#ifdef NETWARE
APR_DECLARE(void) apr_netware_setup_time(void)
