Author: jfclere Date: Fri Dec 21 08:23:45 2007 New Revision: 606235 URL: http://svn.apache.org/viewvc?rev=606235&view=rev Log: Oops committed by error. Sorry.
Modified: tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/jk_util.c tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/portable.h Modified: tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/jk_util.c URL: http://svn.apache.org/viewvc/tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/jk_util.c?rev=606235&r1=606234&r2=606235&view=diff ============================================================================== --- tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/jk_util.c (original) +++ tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/jk_util.c Fri Dec 21 08:23:45 2007 @@ -31,13 +31,6 @@ #include "jk_lb_worker.h" #include "jk_mt.h" -#include "ap_config.h" -#include "httpd.h" -#include "http_config.h" -#include "http_core.h" -#include "http_log.h" - - #define SYSPROPS_OF_WORKER ("sysprops") #define STDERR_OF_WORKER ("stderr") #define STDOUT_OF_WORKER ("stdout") @@ -612,8 +605,6 @@ * to the output routing. */ static int usable_size = HUGE_BUFFER_SIZE - 3; - ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, - "jk_log %d %d %d", l, file, fmt); if (!l || !file || !fmt) { return -1; } Modified: tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/portable.h URL: http://svn.apache.org/viewvc/tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/portable.h?rev=606235&r1=606234&r2=606235&view=diff ============================================================================== --- tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/portable.h (original) +++ tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_12/jk/native/common/portable.h Fri Dec 21 08:23:45 2007 @@ -1,98 +1,18 @@ -/* common/portable.h. Generated from portable.h.in by configure. */ -/* common/portable.h.in. Generated from configure.in by autoheader. */ - -/* Define to 1 if you have the <dlfcn.h> header file. */ -#define HAVE_DLFCN_H 1 - -/* Have flock() */ -#define HAVE_FLOCK 1 - -/* Define to 1 if you have the <inttypes.h> header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the <memory.h> header file. */ -#define HAVE_MEMORY_H 1 - -/* Have snprintf() */ -#define HAVE_SNPRINTF 1 - -/* Define to 1 if you have the <stdint.h> header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the <stdlib.h> header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the <strings.h> header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the <string.h> header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the <sys/filio.h> header file. */ -/* #undef HAVE_SYS_FILIO_H */ - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the <sys/types.h> header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the <unistd.h> 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 `char', as computed by sizeof. */ -#define SIZEOF_CHAR 1 - -/* The size of `int', as computed by sizeof. */ -#define SIZEOF_INT 4 - -/* The size of `long', as computed by sizeof. */ -#define SIZEOF_LONG 4 - -/* The size of `longlong', as computed by sizeof. */ -#define SIZEOF_LONGLONG 0 - -/* The size of `long double', as computed by sizeof. */ -#define SIZEOF_LONG_DOUBLE 12 - -/* The size of `long long', as computed by sizeof. */ -#define SIZEOF_LONG_LONG 8 - -/* The size of pid_t */ -#define SIZEOF_PID_T 4 - -/* The size of `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.26" +/* + * 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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]