tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1837376 - in /tomcat/jk/trunk/native/common: ap_snprintf.c jk_ajp_common.c jk_connect.h jk_mt.h
Date Fri, 03 Aug 2018 14:03:36 GMT
Author: markt
Date: Fri Aug  3 14:03:36 2018
New Revision: 1837376

URL: http://svn.apache.org/viewvc?rev=1837376&view=rev
Log:
Remove some Netware references from the common code

Modified:
    tomcat/jk/trunk/native/common/ap_snprintf.c
    tomcat/jk/trunk/native/common/jk_ajp_common.c
    tomcat/jk/trunk/native/common/jk_connect.h
    tomcat/jk/trunk/native/common/jk_mt.h

Modified: tomcat/jk/trunk/native/common/ap_snprintf.c
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/ap_snprintf.c?rev=1837376&r1=1837375&r2=1837376&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/ap_snprintf.c (original)
+++ tomcat/jk/trunk/native/common/ap_snprintf.c Fri Aug  3 14:03:36 2018
@@ -29,9 +29,7 @@
 
 #include <stdio.h>
 #include <ctype.h>
-#ifndef NETWARE
 #include <sys/types.h>
-#endif
 #include <stdarg.h>
 #include <string.h>
 #include <stdlib.h>

Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=1837376&r1=1837375&r2=1837376&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Fri Aug  3 14:03:36 2018
@@ -32,9 +32,6 @@
 #if defined(AS400) && !defined(AS400_UTF8)
 #include "util_ebcdic.h"
 #endif
-#if defined(NETWARE) && defined(__NOVELL_LIBC__)
-#include "novsock2.h"
-#endif
 
 /* Macro for checking the availability of the cache slot
  */

Modified: tomcat/jk/trunk/native/common/jk_connect.h
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.h?rev=1837376&r1=1837375&r2=1837376&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_connect.h (original)
+++ tomcat/jk/trunk/native/common/jk_connect.h Fri Aug  3 14:03:36 2018
@@ -27,7 +27,7 @@
 #include "jk_logger.h"
 #include "jk_global.h"
 
-#if !defined(WIN32) && !(defined(NETWARE) && defined(__NOVELL_LIBC__))
+#if !defined(WIN32)
 #define closesocket         close
 #endif
 

Modified: tomcat/jk/trunk/native/common/jk_mt.h
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_mt.h?rev=1837376&r1=1837375&r2=1837376&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_mt.h (original)
+++ tomcat/jk/trunk/native/common/jk_mt.h Fri Aug  3 14:03:36 2018
@@ -29,8 +29,6 @@
 
 #if defined(WIN32)
 #define jk_gettid()    ((jk_uint32_t)GetCurrentThreadId())
-#elif defined(NETWARE) && !defined(__NOVELL_LIBC__)
-#define getpid()       ((int)GetThreadGroupID())
 #endif
 
 #ifdef JK_PREFORK 
@@ -66,9 +64,9 @@ typedef pthread_mutex_t JK_CRIT_SEC;
 #define JK_ENTER_CS(x)  pthread_mutex_lock(x)
 #define JK_LEAVE_CS(x)  pthread_mutex_unlock(x)
 
-#if defined(AS400) || defined(NETWARE)
+#if defined(AS400)
 #define jk_pthread_t   jk_uint32_t
-#endif /* AS400 || NETWARE */
+#endif /* AS400 */
 jk_pthread_t jk_gettid(void);
 #endif /* WIN32 */
 
@@ -82,7 +80,7 @@ typedef void *JK_CRIT_SEC;
 #define jk_gettid()         0
 #endif /* MT_CODE */
 
-#if !defined(WIN32) && !defined(NETWARE)
+#if !defined(WIN32)
 #include <unistd.h>
 #include <fcntl.h>
 
@@ -139,7 +137,7 @@ typedef void *JK_CRIT_SEC;
 
 #endif /* USE_FLOCK_LK */
 
-#else  /* WIN32 || NETWARE */
+#else  /* WIN32 */
 #define JK_ENTER_LOCK(x, rc) rc = JK_TRUE
 #define JK_LEAVE_LOCK(x, rc) rc = JK_TRUE
 #endif



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message