svn commit: r746952 - in /tomcat/connectors/trunk/jk/native/common: jk_global.h portable.h
Author: mturk Date: Mon Feb 23 10:43:46 2009 New Revision: 746952 URL: http://svn.apache.org/viewvc?rev=746952&view=rev Log: Fix #46416 by including mstcipip.h even if the apr doesn't include it Modified: tomcat/connectors/trunk/jk/native/common/jk_global.h tomcat/connectors/trunk/jk/native/common/portable.h Modified: tomcat/connectors/trunk/jk/native/common/jk_global.h URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_global.h?rev=746952&r1=746951&r2=746952&view=diff == --- tomcat/connectors/trunk/jk/native/common/jk_global.h (original) +++ tomcat/connectors/trunk/jk/native/common/jk_global.h Mon Feb 23 10:43:46 2009 @@ -97,7 +97,7 @@ /* Restrict the server to a subset of Windows NT 4.0 header files by default */ -#define _WIN32_WINNT 0x0400 +#define _WIN32_WINNT 0x0500 #endif #ifndef NOUSER #define NOUSER @@ -119,6 +119,11 @@ #include #include #endif /* _WINDOWS_ */ +#ifdef _WINDOWS_ +#ifndef SIO_RCVALL +#include +#endif +#endif #include #include #include Modified: tomcat/connectors/trunk/jk/native/common/portable.h URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/portable.h?rev=746952&r1=746951&r2=746952&view=diff == --- tomcat/connectors/trunk/jk/native/common/portable.h (original) +++ tomcat/connectors/trunk/jk/native/common/portable.h Mon Feb 23 10:43:46 2009 @@ -1,18 +1,98 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* On most platform this file is overwritten when doing configure */ -/* DON'T COMMIT THE FILE IT BREAKS windoze and Netware, commit the sample file */ +/* common/portable.h. Generated by configure. */ +/* common/portable.h.in. Generated from configure.in by autoheader. */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Have flock() */ +#define HAVE_FLOCK 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Have snprintf() */ +#define HAVE_SNPRINTF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_FILIO_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Have vsnprintf() */ +#define HAVE_VSNPRINTF 1 + +/* Name of package */ +#define PACKAGE "mod_jk" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "" + +/* The size of a `char', as computed by sizeof. */ +#define SIZEOF_CHAR 1 + +/* The size of a `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of a `long', as computed by sizeof. */ +#define SIZEOF_LONG 4 + +/* The size of a `longlong', as computed by sizeof. */ +#define SIZEOF_LONGLONG 0 + +/* The size of a `long double', as computed by sizeof. */ +#define SIZEOF_LONG_DOUBLE 12 + +/* The size of a `long long', as computed by sizeof. */ +#define SIZEOF_LONG_LONG 8 + +/* The size of pid_t */ +#define SIZEOF_PID_T 4 + +/* The size of a `short', as computed by sizeof. */ +#define SIZEOF_SHORT 2 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to use SO_RCVTIMEO with setsockopt() */ +#define USE_SO_RCVTIMEO 1 + +/* Define to use SO_SNDTIMEO with setsockopt() */ +#define USE_SO_SNDTIMEO 1 + +
svn commit: r746953 - /tomcat/connectors/trunk/jk/native/common/portable.h
Author: mturk Date: Mon Feb 23 10:45:30 2009 New Revision: 746953 URL: http://svn.apache.org/viewvc?rev=746953&view=rev Log: Opps. We'll have to fix the portable.h so it doesn't get commited by error Modified: tomcat/connectors/trunk/jk/native/common/portable.h Modified: tomcat/connectors/trunk/jk/native/common/portable.h URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/portable.h?rev=746953&r1=746952&r2=746953&view=diff == --- tomcat/connectors/trunk/jk/native/common/portable.h (original) +++ tomcat/connectors/trunk/jk/native/common/portable.h Mon Feb 23 10:45:30 2009 @@ -1,98 +1,18 @@ -/* common/portable.h. Generated by configure. */ -/* common/portable.h.in. Generated from configure.in by autoheader. */ - -/* Define to 1 if you have the header file. */ -#define HAVE_DLFCN_H 1 - -/* Have flock() */ -#define HAVE_FLOCK 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Have snprintf() */ -#define HAVE_SNPRINTF 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_FILIO_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Have vsnprintf() */ -#define HAVE_VSNPRINTF 1 - -/* Name of package */ -#define PACKAGE "mod_jk" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "" - -/* The size of a `char', as computed by sizeof. */ -#define SIZEOF_CHAR 1 - -/* The size of a `int', as computed by sizeof. */ -#define SIZEOF_INT 4 - -/* The size of a `long', as computed by sizeof. */ -#define SIZEOF_LONG 4 - -/* The size of a `longlong', as computed by sizeof. */ -#define SIZEOF_LONGLONG 0 - -/* The size of a `long double', as computed by sizeof. */ -#define SIZEOF_LONG_DOUBLE 12 - -/* The size of a `long long', as computed by sizeof. */ -#define SIZEOF_LONG_LONG 8 - -/* The size of pid_t */ -#define SIZEOF_PID_T 4 - -/* The size of a `short', as computed by sizeof. */ -#define SIZEOF_SHORT 2 - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define to use SO_RCVTIMEO with setsockopt() */ -#define USE_SO_RCVTIMEO 1 - -/* Define to use SO_SNDTIMEO with setsockopt() */ -#define USE_SO_SNDTIMEO 1 - -/* Version number of package */ -#define VERSION "1.2.28" +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/* On most platform this file is overwritten when doing configure */ +/* DON'T COMMIT THE FILE IT BREAKS windoze and Netware, commit the sample file */ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46416] Include order in jk_global.h breaks mod_jk build on Windows + Visual Studio 2005
https://issues.apache.org/bugzilla/show_bug.cgi?id=46416 --- Comment #1 from Mladen Turk 2009-02-23 02:46:27 PST --- Can you check if the trunk jk_global.h fixes the build? -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Going for jk 1.2.28
Tim Whittington wrote: I¹d appreciate a fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=46416 so I can build on Windows without local patches. Recent APR version have that included. Can you check the current trunk version? Regards -- ^(TM) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r747040 - /tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Author: markt
Date: Mon Feb 23 14:56:19 2009
New Revision: 747040
URL: http://svn.apache.org/viewvc?rev=747040&view=rev
Log:
Fix various Eclipse warnings.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=747040&r1=747039&r2=747040&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Mon Feb 23
14:56:19 2009
@@ -345,7 +345,7 @@
synchronized (webDigester) {
try {
if (altDDName != null) {
-url = new File(altDDName).toURL();
+url = new File(altDDName).toURI().toURL();
} else {
url = servletContext.getResource(
Constants.ApplicationWebXml);
@@ -384,9 +384,7 @@
webDigester.reset();
parseException = null;
try {
-if (stream != null) {
-stream.close();
-}
+stream.close();
} catch (IOException e) {
log.error(sm.getString("contextConfig.applicationClose"),
e);
}
@@ -923,8 +921,7 @@
}
-protected void antiLocking()
-throws IOException {
+protected void antiLocking() {
if ((context instanceof StandardContext)
&& ((StandardContext) context).getAntiResourceLocking()) {
@@ -1023,12 +1020,8 @@
*/
protected synchronized void beforeStart() {
-try {
-antiLocking();
-} catch (IOException e) {
-log.error(sm.getString("contextConfig.antiLocking"), e);
-}
-
+antiLocking();
+
}
@@ -1335,9 +1328,8 @@
new File(System.getProperty("catalina.base"), "conf");
if (!configBase.exists()) {
return null;
-} else {
-return configBase;
}
+return configBase;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46416] Include order in jk_global.h breaks mod_jk build on Windows + Visual Studio 2005
https://issues.apache.org/bugzilla/show_bug.cgi?id=46416 Tim Whittington changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Tim Whittington 2009-02-23 12:43:29 PST --- Looks good now - thanks. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
