Author: rjung
Date: Wed Jul 25 03:39:31 2007
New Revision: 559390
URL: http://svn.apache.org/viewvc?view=rev&rev=559390
Log:
Fix compilation error under windows
caused by the complex gettimeofday() macro.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_util.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?view=diff&rev=559390&r1=559389&r2=559390
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Wed Jul 25 03:39:31 2007
@@ -423,7 +423,11 @@
#ifndef NO_GETTIMEOFDAY
if ( l->log_fmt_type != JK_TIME_SUBSEC_NONE ) {
struct timeval tv;
- int rc = gettimeofday(&tv, NULL);
+ int rc;
+
+ /* Don't concat the next line with the previous one, */
+ /* because gettimeofday() is a macro for WIN32 */
+ rc = gettimeofday(&tv, NULL);
if ( rc == 0 ) {
char subsec[7];
t = tv.tv_sec;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
