bnicholes 01/12/11 11:40:50
Modified: threadproc/netware thread.c
include/arch/netware networkio.h
include apr_general.h apr.hnw
Log:
Clean up GNU compiler issues on NetWare
Submitted by: Pavel Novy
Revision Changes Path
1.8 +1 -1 apr/threadproc/netware/thread.c
Index: thread.c
===================================================================
RCS file: /home/cvs/apr/threadproc/netware/thread.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- thread.c 2001/11/30 22:27:48 1.7
+++ thread.c 2001/12/11 19:40:50 1.8
@@ -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
1.2 +1 -1 apr/include/arch/netware/networkio.h
Index: networkio.h
===================================================================
RCS file: /home/cvs/apr/include/arch/netware/networkio.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- networkio.h 2001/08/27 19:11:04 1.1
+++ networkio.h 2001/12/11 19:40:50 1.2
@@ -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 */
1.62 +2 -0 apr/include/apr_general.h
Index: apr_general.h
===================================================================
RCS file: /home/cvs/apr/include/apr_general.h,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- apr_general.h 2001/08/24 17:15:00 1.61
+++ apr_general.h 2001/12/11 19:40:50 1.62
@@ -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'
1.3 +5 -1 apr/include/apr.hnw
Index: apr.hnw
===================================================================
RCS file: /home/cvs/apr/include/apr.hnw,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apr.hnw 2001/11/19 21:11:32 1.2
+++ apr.hnw 2001/12/11 19:40:50 1.3
@@ -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 @@
/* 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
