Author: rjung
Date: Tue Oct 25 19:04:27 2011
New Revision: 1188856
URL: http://svn.apache.org/viewvc?rev=1188856&view=rev
Log:
47038: Fix compiler warning when using --enable-flock
for configure.
Modified:
tomcat/jk/trunk/native/common/jk_mt.h
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/common/jk_mt.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_mt.h?rev=1188856&r1=1188855&r2=1188856&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_mt.h (original)
+++ tomcat/jk/trunk/native/common/jk_mt.h Tue Oct 25 19:04:27 2011
@@ -92,12 +92,14 @@ typedef void *JK_CRIT_SEC;
#include <fcntl.h>
-#define USE_FLOCK_LK 0
#if HAVE_FLOCK
#ifdef JK_USE_FLOCK
#define USE_FLOCK_LK 1
#endif
#endif
+#ifndef USE_FLOCK_LK
+#define USE_FLOCK_LK 0
+#endif
#if USE_FLOCK_LK
#include <sys/file.h>
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1188856&r1=1188855&r2=1188856&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Tue Oct 25 19:04:27 2011
@@ -44,6 +44,10 @@
<br />
<subsection name="Native">
<changelog>
+ <fix>
+ <bug>47038</bug>: Fix compiler warning when using --enable-flock
+ for configure. (rjung)
+ </fix>
<add>
<bug>51326</bug>: URI Map: Add "session_cookie" and "session_path"
rule extensions. Contributed by Eiji Takahashi. (rjung)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
