You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2015/01/07 12:21:47 UTC
svn commit: r1650036 - in /tomcat/jk/trunk: native/common/jk_global.h
xdocs/miscellaneous/changelog.xml
Author: rjung
Date: Wed Jan 7 11:21:47 2015
New Revision: 1650036
URL: http://svn.apache.org/r1650036
Log:
Fix annoying redefine warnings for the autoconf
PACKAGE defines during configure based builds.
Modified:
tomcat/jk/trunk/native/common/jk_global.h
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/common/jk_global.h
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_global.h?rev=1650036&r1=1650035&r2=1650036&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_global.h (original)
+++ tomcat/jk/trunk/native/common/jk_global.h Wed Jan 7 11:21:47 2015
@@ -26,6 +26,18 @@
#define JK_GLOBAL_H
#if defined(HAVE_CONFIG_H)
+
+/* Undefine autoconf defines also existing
+ * in Apache web server includes, and which
+ * will be redefined in our config.h */
+#undef PACKAGE
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_URL
+
#include "config.h"
#endif
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1650036&r1=1650035&r2=1650036&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Wed Jan 7 11:21:47 2015
@@ -192,6 +192,10 @@
<fix>
Adjust linger parameters used during connection shutdown. (rjung)
</fix>
+ <fix>
+ Fix annoying redefine warnings for the autoconf PACKAGE defines
+ during configure based builds. (rjung)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org