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/jk/native/common jk_md5.h
Date Fri, 08 Oct 2004 07:23:51 GMT
mturk       2004/10/08 00:23:51

  Modified:    jk/native/common jk_md5.h
  Log:
  Int is not 32 bits on all platforms.
  
  Revision  Changes    Path
  1.3       +12 -4     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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jk_md5.h	24 Feb 2004 08:45:48 -0000	1.2
  +++ jk_md5.h	8 Oct 2004 07:23:51 -0000	1.3
  @@ -56,13 +56,21 @@
   #define JK_MD5_DIGESTSIZE 16
   
   /* JK_UINT4 defines a four byte word */
  +#if HAVE_APR
  +typedef apr_uint32_t JK_UINT4;
  +#else
  +#ifdef WIN32
  +typedef DWORD JK_UINT4;
  +#else
   typedef unsigned int JK_UINT4;
  +#endif
  +#endif /* HAVE_APR */
   
   /* MD5 context. */
   typedef struct {
  -    JK_UINT4 state[4];		/* state (ABCD) */
  -    JK_UINT4 count[2];		/* number of bits, modulo 2^64 (lsb first) */
  -    unsigned char buffer[64];	/* input buffer */
  +    JK_UINT4 state[4];      /* state (ABCD) */
  +    JK_UINT4 count[2];      /* number of bits, modulo 2^64 (lsb first) */
  +    unsigned char buffer[64];   /* input buffer */
   } JK_MD5_CTX;
   
   /*
  @@ -80,4 +88,4 @@
   }
   #endif
   
  -#endif	/* !JK_APACHE_MD5_H */
  +#endif  /* !JK_APACHE_MD5_H */
  
  
  

---------------------------------------------------------------------
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