Re: Newest JK commits

[NormW]

NormW wrote:
Mladen Turk wrote:
NormW wrote:
Missed a patch perhaps?
A build on Apache 2.1 shows symbols F_GETFL, F_SETFL as undefined and 
a text search through the JTC source tree finds the only references 
in jk_connect.c
Norm

Seems that we are missing header on Netware.
IMO the F_GETFL/F_SETFL are defined inside <nks/fsio.h>, correct?
I have added the needed header to jk_global.h. Can you check that?
If it still doesn't compile can you figure out the needed header
files.
MT.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
.
Good evening,
 From a 'quick' check, F_GETFL and F_SETFL are in fcntl.h, and can get 
passed the previous error by just adding "fcntl.h" on its own at the 
same place you did (seems errno.h isn't required at this point, but so 
far I'm just trying a build with 2.1).
However, I now get the following error:

Generating Release\mod_jk_link.opt
Linking Release/mod_jk.nlm
### mwldnlm Linker Error:
#   Undefined symbol: 'jk_map_free'
#   referenced from 'jk_apr_pool_cleanup' in mod_jk.o
#   referenced from 'jk_apr_pool_cleanup' in mod_jk.o
#   referenced from 'jk_apr_pool_cleanup' in mod_jk.o
A text search of the jtc source tree fails to find any reference to 
where this is definded, which from its prefix, I assume is supposed to 
be in there somewhere...
Norm

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
.
So goes another day.
Greetings,
Attached are two diff's that, along with the jk_map_free{} updates now 
let mod_jk build for apache 1.3.33, 2.0.52 and 2.1.

1. The fcntl.h is needed for both apache 1.3 (using CLIB) and 2.x using 
LibC, and there is a fcntl.h accessible in both libraries. The error.h 
proved to be unrequired AFAICT and the patch removes it.

2. The uint32_t appears, AFAICT, only referenced within the Apache2 
build, where most references use apr_uint32_t... so patch 2 to jk_md5.h 
provides an alternate (same) definiton normally exported in the Apache2 
build but only makes this available when not using LIBC, ie when 
building Apache 1.3.

The built nlm's were 'trialed' on a NetWare platform and no problems 
access Tomcat were experienced during a brief test.

Prudence suggests a more experienced NetWare peron might want to check 
these patches over, but for the moment at least, these seem to work.

Norm
jk_global.h
--- jk_global.h.orig    2004-11-09 20:17:04.000000000 +1100
+++ jk_global.h 2004-11-10 10:44:21.000000000 +1100
@@ -65,14 +65,13 @@
 #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__
 #define HAVE_VSNPRINTF
 #define HAVE_SNPRINTF
 #endif
+#include "fcntl.h"
 #include <netdb.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
jk_md5.h
--- jk_md5.h.orig       2004-11-09 06:24:25.000000000 +1100
+++ jk_md5.h    2004-11-10 10:28:52.000000000 +1100
@@ -60,8 +60,12 @@
 #ifdef WIN32
     typedef DWORD JK_UINT4;
 #else
+#if defined(NETWARE) && !defined(__NOVELL_LIBC__)
+    typedef unsigned long int JK_UINT4;
+#else
     typedef uint32_t JK_UINT4;
 #endif
+#endif
 /* MD5 context. */
 typedef struct
--- jk_md5.h.orig       2004-11-09 06:24:25.000000000 +1100
+++ jk_md5.h    2004-11-10 10:28:52.000000000 +1100
@@ -60,8 +60,12 @@
 #ifdef WIN32
     typedef DWORD JK_UINT4;
 #else
+#if defined(NETWARE) && !defined(__NOVELL_LIBC__)
+    typedef unsigned long int JK_UINT4;
+#else
     typedef uint32_t JK_UINT4;
 #endif
+#endif
 
 /* MD5 context. */
 typedef struct
--- jk_global.h.orig    2004-11-09 20:17:04.000000000 +1100
+++ jk_global.h 2004-11-10 10:44:21.000000000 +1100
@@ -65,14 +65,13 @@
 #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__
 #define HAVE_VSNPRINTF
 #define HAVE_SNPRINTF
 #endif
+#include "fcntl.h"
 #include <netdb.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]