mmanders 2003/11/19 15:58:20
Modified: jk/native2/include jk_global.h
Log:
Patch submitted by Guenter Knauf to get mod_jk2 to build for NetWare.
Revision Changes Path
1.20 +38 -24 jakarta-tomcat-connectors/jk/native2/include/jk_global.h
Index: jk_global.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_global.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jk_global.h 30 Oct 2003 20:11:33 -0000 1.19
+++ jk_global.h 19 Nov 2003 23:58:20 -0000 1.20
@@ -133,24 +133,28 @@
#include <winsock.h>
#else
#include <unistd.h>
- #include <netdb.h>
-
- #include <netinet/in.h>
- #include <sys/socket.h>
- #ifndef NETWARE
- #include <netinet/tcp.h>
- #include <arpa/inet.h>
- #include <sys/un.h>
- #if !defined(_OSD_POSIX) && !defined(AS400) && !defined(CYGWIN)
- #include <sys/socketvar.h>
- #endif
- #if !defined(HPUX11) && !defined(AS400)
- #include <sys/select.h>
+ #ifdef __NOVELL_LIBC__
+ #include <novsock2.h>
+ #else
+ #include <netdb.h>
+
+ #include <netinet/in.h>
+ #include <sys/socket.h>
+ #ifndef NETWARE
+ #include <netinet/tcp.h>
+ #include <arpa/inet.h>
+ #include <sys/un.h>
+ #if !defined(_OSD_POSIX) && !defined(AS400) && !defined(CYGWIN)
+ #include <sys/socketvar.h>
+ #endif
+ #if !defined(HPUX11) && !defined(AS400)
+ #include <sys/select.h>
+ #endif
#endif
+
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
#endif
-
- #include <sys/time.h>
- #include <sys/ioctl.h>
#endif
#ifdef WIN32
@@ -219,11 +223,19 @@
#endif
#if defined(WIN32) || defined(NETWARE)
- #define JK_METHOD __stdcall
- #define C_LEVEL_TRY_START __try {
- #define C_LEVEL_TRY_END }
- #define C_LEVEL_FINALLY_START __finally {
- #define C_LEVEL_FINALLY_END }
+ #ifdef __GNUC__
+ #define JK_METHOD
+ #define C_LEVEL_TRY_START
+ #define C_LEVEL_TRY_END
+ #define C_LEVEL_FINALLY_START
+ #define C_LEVEL_FINALLY_END
+ #else
+ #define JK_METHOD __stdcall
+ #define C_LEVEL_TRY_START __try {
+ #define C_LEVEL_TRY_END }
+ #define C_LEVEL_FINALLY_START __finally {
+ #define C_LEVEL_FINALLY_END }
+ #endif
#define PATH_SEPERATOR (';')
#define PATH_SEPARATOR_STR (";")
#define FILE_SEPERATOR ('\\')
@@ -238,8 +250,10 @@
#define strncasecmp strnicmp
#endif
- #ifndef vsnprintf
- #define vsnprintf _vsnprintf
+ #ifndef __NOVELL_LIBC__
+ #ifndef vsnprintf
+ #define vsnprintf _vsnprintf
+ #endif
#endif
#else
#define JK_METHOD
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
