You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2010/09/10 19:48:16 UTC
svn commit: r995901 - /tomcat/jk/trunk/native/common/portable.h
Author: mturk
Date: Fri Sep 10 17:48:15 2010
New Revision: 995901
URL: http://svn.apache.org/viewvc?rev=995901&view=rev
Log:
Oops. We should really do something with that portable.h
Modified:
tomcat/jk/trunk/native/common/portable.h
Modified: tomcat/jk/trunk/native/common/portable.h
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/portable.h?rev=995901&r1=995900&r2=995901&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/portable.h (original)
+++ tomcat/jk/trunk/native/common/portable.h Fri Sep 10 17:48:15 2010
@@ -1,110 +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 <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 poll() */
-#define HAVE_POLL 1
-
-/* Define to 1 if you have the <poll.h> header file. */
-#define HAVE_POLL_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 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 pthread_t */
-#define SIZEOF_PTHREAD_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 SOCK_CLOEXEC with socket() */
-/* #undef USE_SOCK_CLOEXEC */
-
-/* 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.29"
+/*
+ * 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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r995901 - /tomcat/jk/trunk/native/common/portable.h
Posted by Mladen Turk <mt...@apache.org>.
On 09/11/2010 09:54 AM, William A. Rowe Jr. wrote:
>>
>> So, dunno if we need to ship that at the first place.
>
> Sounds like not.
>
> This might be a good point to drop it and let people confirm that it isn't used?
>
+1
Regards
--
^TM
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r995901 - /tomcat/jk/trunk/native/common/portable.h
Posted by "William A. Rowe Jr." <wr...@rowe-clan.net>.
On 9/11/2010 12:23 AM, Mladen Turk wrote:
> On 09/10/2010 08:06 PM, William A. Rowe Jr. wrote:
>> On 9/10/2010 12:48 PM, mturk@apache.org wrote:
>>> Author: mturk
>>> Date: Fri Sep 10 17:48:15 2010
>>> New Revision: 995901
>>>
>>> URL: http://svn.apache.org/viewvc?rev=995901&view=rev
>>> Log:
>>> Oops. We should really do something with that portable.h
>>
>> svn rm it. The make files need simple cat portable.h.in> portable.h statements
>> to generate timestamped flavors on netware/win32/os2.
>>
>
> Well it's already excluded in jk_global.h by
> #if !defined(WIN32) && !defined(AS400) && !defined(NETWARE)
> #include "portable.h"
> #endif
>
> So, dunno if we need to ship that at the first place.
Sounds like not.
This might be a good point to drop it and let people confirm that it isn't used?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r995901 - /tomcat/jk/trunk/native/common/portable.h
Posted by Mladen Turk <mt...@apache.org>.
On 09/10/2010 08:06 PM, William A. Rowe Jr. wrote:
> On 9/10/2010 12:48 PM, mturk@apache.org wrote:
>> Author: mturk
>> Date: Fri Sep 10 17:48:15 2010
>> New Revision: 995901
>>
>> URL: http://svn.apache.org/viewvc?rev=995901&view=rev
>> Log:
>> Oops. We should really do something with that portable.h
>
> svn rm it. The make files need simple cat portable.h.in> portable.h statements
> to generate timestamped flavors on netware/win32/os2.
>
Well it's already excluded in jk_global.h by
#if !defined(WIN32) && !defined(AS400) && !defined(NETWARE)
#include "portable.h"
#endif
So, dunno if we need to ship that at the first place.
Regards
--
^TM
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r995901 - /tomcat/jk/trunk/native/common/portable.h
Posted by "William A. Rowe Jr." <wr...@rowe-clan.net>.
On 9/10/2010 12:48 PM, mturk@apache.org wrote:
> Author: mturk
> Date: Fri Sep 10 17:48:15 2010
> New Revision: 995901
>
> URL: http://svn.apache.org/viewvc?rev=995901&view=rev
> Log:
> Oops. We should really do something with that portable.h
svn rm it. The make files need simple cat portable.h.in > portable.h statements
to generate timestamped flavors on netware/win32/os2.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org