diff options
| -rw-r--r-- | include/apr.hnw | 6 | ||||
| -rw-r--r-- | include/apr_general.h | 2 | ||||
| -rw-r--r-- | include/arch/netware/networkio.h | 2 | ||||
| -rw-r--r-- | threadproc/netware/thread.c | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/include/apr.hnw b/include/apr.hnw index 04ec8d7a9..70dcebd02 100644 --- a/include/apr.hnw +++ b/include/apr.hnw @@ -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,11 @@ typedef int apr_socklen_t; /* Mechanisms to properly type numeric literals */ +#ifdef __GNUC__ +#define APR_INT64_C(val) (val) +#else #define APR_INT64_C(val) (val##i64) +#endif //srj added in here, libc c no longer takes care of these diff --git a/include/apr_general.h b/include/apr_general.h index bc1c2b60b..91f6ed734 100644 --- a/include/apr_general.h +++ b/include/apr_general.h @@ -83,7 +83,9 @@ extern "C" { #define TRUE (!FALSE) #endif +#ifndef MAXIMUM_WAIT_OBJECTS #define MAXIMUM_WAIT_OBJECTS 64 +#endif #define APR_ASCII_BLANK '\040' #define APR_ASCII_CR '\015' diff --git a/include/arch/netware/networkio.h b/include/arch/netware/networkio.h index 361ff9654..f7471dc68 100644 --- a/include/arch/netware/networkio.h +++ b/include/arch/netware/networkio.h @@ -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 */ diff --git a/threadproc/netware/thread.c b/threadproc/netware/thread.c index 6688a2c45..926da0a2f 100644 --- a/threadproc/netware/thread.c +++ b/threadproc/netware/thread.c @@ -110,7 +110,7 @@ apr_status_t apr_thread_create(apr_thread_t **new, 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 |