httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From NormW <no...@gknw.net>
Subject Re: [PATCH] default_rel_runtimedir everywhere (Windows, NetWare)
Date Mon, 28 Mar 2011 04:51:12 GMT
On 28/03/2011 10:41 AM, NormW wrote:
> On 28/03/2011 9:54 AM, Jeff Trawick wrote:
>> On Sun, Mar 27, 2011 at 6:09 PM, William A. Rowe Jr.
>> <wrowe@rowe-clan.net> wrote:
>>> On 3/27/2011 10:30 AM, Jeff Trawick wrote:
>>>>
>>>> Concerns (such as better name for the new file)?
>>>
>>> Only one... please don't add #include logic, let Gunter and I wire up
>>> the auto-copy to ap_config_layout.h and we will truly be consistent.
>>>
>>> You can update the patch to assume that file always exists. Let's keep
>>> the main .c code as absolutely consistent as possible with fewer
>>> per-arch
>>> variations.
>>
>> ap_config.h now unconditionally includes ap_config_layout.h.
>>
>> I renamed the two OS-specific, non-autoconf-build versions to
>> {win32,netware}_config_layout.h to make it obvious to lurkers that
>> they should not include this file as present in the os directory.
>>
A patch to httpd-trunk similar to the following does the trick (on 
NetWare at least).

Index: include/ap_config.h
===================================================================
--- include/ap_config.h	(revision 1086115)
+++ include/ap_config.h	(working copy)
@@ -232,8 +232,12 @@
  #include "os.h"
  #if (!defined(WIN32) && !defined(NETWARE)) || defined(__MINGW32__)
  #include "ap_config_auto.h"
+#include "ap_config_layout.h"
+#elif defined(NETWARE)
+#include "netware_config_layout.h"
+#elif defined(WIN32)
+#include "win32_config_layout.h"
  #endif
-#include "ap_config_layout.h"

  #if defined(NETWARE)
  #define AP_NONBLOCK_WHEN_MULTI_LISTEN 1

Norm

Mime
View raw message