Fix up the log resolve utility to work with NetWare. Increased the stack size

and fixed WSAStartup to use the correct version number

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98984 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/support/NWGNUlogres b/support/NWGNUlogres
index 97ea1f1f3e614a001b19de1a6c23764bf5ffd557..0c717f7137b3506abc9932b3717bd7469235d7cd 100644 (file)
--- a/support/NWGNUlogres
+++ b/support/NWGNUlogres
@@ -93,7 +93,7 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = logreslv
+NLM_NAME               = logres
 
 #
 # This is used by the link '-desc ' directive.
@@ -105,7 +105,7 @@ NLM_DESCRIPTION     = Apache $(VERSION_STR) Logresolve Utility for NetWare
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
-NLM_THREAD_NAME        = logreslv
+NLM_THREAD_NAME        = logres
 
 #
 # This is used by the '-screenname' directive.  If left blank,
@@ -122,7 +122,7 @@ NLM_VERSION         =
 #
 # If this is specified, it will override the default of 64K
 #
-NLM_STACK_SIZE = 8192
+NLM_STACK_SIZE = 65536
 
 
 #

diff --git a/support/logresolve.c b/support/logresolve.c
index 31dc609fdae4e7852d32a6e44e9110088cc63109..84cbf63e0cc0a98e0728e7c67e3b0d653ebc46df 100644 (file)
--- a/support/logresolve.c
+++ b/support/logresolve.c
@@ -300,12 +300,12 @@ int main (int argc, char *argv[])
     char *bar, hoststring[MAXDNAME + 1], line[MAXLINE], *statfile;
     int i, check;
 
-#ifdef WIN32
+#if defined(WIN32) || defined(NETWARE)
     /*  If we apr'ify this code, apr_pool_create/apr_pool_destroy
      *  should perform the WSAStartup/WSACleanup for us. 
      */
     WSADATA wsaData;
-    WSAStartup(0x101, &wsaData);
+    WSAStartup(MAKEWORD(2, 0), &wsaData);
 #endif
 
     check = 0;
@@ -362,7 +362,7 @@ int main (int argc, char *argv[])
            puts(hoststring);
     }
 
-#ifdef WIN32
+#if defined(WIN32) || defined(NETWARE)
      WSACleanup();
 #endif