mturk 2004/11/10 06:35:41
Modified: jk/native/common jk_global.h jk_md5.h
Log:
Fix Netware includes and type definitions.
Revision Changes Path
1.37 +2 -4 jakarta-tomcat-connectors/jk/native/common/jk_global.h
Index: jk_global.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_global.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- jk_global.h 9 Nov 2004 08:17:03 -0000 1.36
+++ jk_global.h 10 Nov 2004 14:35:41 -0000 1.37
@@ -65,8 +65,6 @@
#include <unistd.h>
#if defined(NETWARE) && defined(__NOVELL_LIBC__)
#include "novsock2.h"
-#include <nks/fsio.h>
-#include <nks/errno.h>
#define __sys_socket_h__
#define __netdb_h__
#define __netinet_in_h__
@@ -76,11 +74,11 @@
#include <netdb.h>
#include <netinet/in.h>
#include <sys/socket.h>
+#include <fcntl.h>
#ifndef NETWARE
#include <netinet/tcp.h>
#include <arpa/inet.h>
#include <sys/un.h>
-#include <fcntl.h>
#if !defined(_OSD_POSIX) && !defined(AS400) && !defined(CYGWIN)
#include <sys/socketvar.h>
#endif
1.6 +3 -1 jakarta-tomcat-connectors/jk/native/common/jk_md5.h
Index: jk_md5.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_md5.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_md5.h 8 Nov 2004 13:31:55 -0000 1.5
+++ jk_md5.h 10 Nov 2004 14:35:41 -0000 1.6
@@ -57,8 +57,10 @@
#define JK_MD5_DIGESTSIZE 16
/* JK_UINT4 defines a four byte word */
-#ifdef WIN32
+#if defined (WIN32)
typedef DWORD JK_UINT4;
+#elif defined(NETWARE) && !defined(__NOVELL_LIBC__)
+ typedef unsigned int JK_UINT4;
#else
typedef uint32_t JK_UINT4;
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
