tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jni/native/include tcn.h
Date Tue, 24 May 2005 09:17:50 GMT
mturk       2005/05/24 02:17:50

  Modified:    jni/native/include tcn.h
  Log:
  Remove unused 'min' macro and simplify the int64<->pointer conversion.
  
  Revision  Changes    Path
  1.4       +2 -7      jakarta-tomcat-connectors/jni/native/include/tcn.h
  
  Index: tcn.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/include/tcn.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- tcn.h	18 Apr 2005 12:30:54 -0000	1.3
  +++ tcn.h	24 May 2005 09:17:49 -0000	1.4
  @@ -26,11 +26,6 @@
   #define TCN_ASSERT(x) (void)0
   #endif
   
  -#ifdef min
  -#undef min
  -#endif
  -#define min(a, b)  ((a) < (b) ? (a) : (b))
  -
   #ifndef APR_MAX_IOVEC_SIZE
   #define APR_MAX_IOVEC_SIZE 1024
   #endif
  @@ -40,8 +35,8 @@
   #define TCN_ERROR_CLASS "org/apache/tomcat/jni/Error"
   
   #define UNREFERENCED(P) (P)
  -#define P2J(P)          ((jlong)(long)(void *)P)
  -#define J2P(P, T)       ((T)(void *)(long)P)
  +#define P2J(P)          ((jlong)(P))
  +#define J2P(P, T)       ((T)((jlong)(P)))
   /* On stack buffer size */
   #define TCN_BUFFER_SZ   8192
   #define TCN_STDARGS     JNIEnv *e, jobject o
  
  
  

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


Mime
View raw message