From 0f8b45217c2832fc31abc35b77e8b35b6bd4e230 Mon Sep 17 00:00:00 2001
From: sekelsenmat <sekelsenmat@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sun, 24 Sep 2006 22:59:32 +0000
Subject: [PATCH] Fixes for 2.0 bindings on windows

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@15 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 httpd/httpd_2_0/apr/apr.pas  |   8 +-
 httpd/httpd_2_0/http_log.inc |   3 +-
 httpd/mod_hello.lpi          | 282 +++++++++++++++++++++--------------
 httpd/mod_hello.lpr          |   2 +-
 4 files changed, 179 insertions(+), 116 deletions(-)

diff --git a/httpd/httpd_2_0/apr/apr.pas b/httpd/httpd_2_0/apr/apr.pas
index 41e10da6c..dc67ecb0d 100644
--- a/httpd/httpd_2_0/apr/apr.pas
+++ b/httpd/httpd_2_0/apr/apr.pas
@@ -110,8 +110,6 @@ type
   apr_int16_t = SmallInt;
   Papr_int16_t = ^SmallInt;
 
-  va_list = Pointer;
-
   // Network structures
   
   sockaddr = record
@@ -119,6 +117,10 @@ type
     sa_data: array [1..14] of Char;  // (NBO) 14 bytes of protocol address
   end;
   
+{$ifndef windows}
+
+  va_list = Pointer;
+
   in_addr = record
     s_addr: culong;        // load with inet_aton()
   end;
@@ -130,6 +132,8 @@ type
     sin_zero: array [1..8] of Char;  // zero this if you want to
   end;
   
+{$endif}
+
   in6_addr = record
    Case Integer of
     1: (u6_addr8: array [1..16] of Byte);
diff --git a/httpd/httpd_2_0/http_log.inc b/httpd/httpd_2_0/http_log.inc
index 7cb0e36e2..12c158702 100644
--- a/httpd/httpd_2_0/http_log.inc
+++ b/httpd/httpd_2_0/http_log.inc
@@ -147,8 +147,7 @@ procedure ap_log_error(
  const file_: PChar; line, level: Integer;
  status: apr_status_t; const s: Pserver_rec;
  const fmt: PChar; others: array of const);
- {$IFDEF WINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
- external LibHTTPD name 'ap_log_error';
+ cdecl; external LibHTTPD name 'ap_log_error';
 
 //			    __attribute__((format(printf,6,7)));
 
diff --git a/httpd/mod_hello.lpi b/httpd/mod_hello.lpi
index 53cf6ec84..65af9a6b4 100644
--- a/httpd/mod_hello.lpi
+++ b/httpd/mod_hello.lpi
@@ -1,16 +1,36 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <PathDelim Value="/"/>
+    <PathDelim Value="\"/>
     <Version Value="5"/>
     <General>
       <MainUnit Value="0"/>
       <IconPath Value="./"/>
       <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="4"/>
+      <ActiveEditorIndexAtStart Value="1"/>
     </General>
+    <VersionInfo>
+      <UseVersionInfo Value="False"/>
+      <AutoIncrementBuild Value="False"/>
+      <CurrentVersionNr Value="0"/>
+      <CurrentMajorRevNr Value="0"/>
+      <CurrentMinorRevNr Value="0"/>
+      <CurrentBuildNr Value="0"/>
+      <ProjectVersion Value="1,0,0,0"/>
+      <Language Value="0409"/>
+      <CharSet Value="04E4"/>
+      <Comments Value=""/>
+      <CompanyName Value=""/>
+      <FileDescription Value=""/>
+      <InternalName Value=""/>
+      <LegalCopyright Value=""/>
+      <LegalTrademarks Value=""/>
+      <OriginalFilename Value=""/>
+      <ProductName Value=""/>
+    </VersionInfo>
     <PublishOptions>
       <Version Value="2"/>
+      <DestinationDirectory Value="$(TestDir)\publishedproject\"/>
       <IgnoreBinaries Value="False"/>
       <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
       <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
@@ -18,16 +38,16 @@
     <RunParams>
       <local>
         <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
-    <Units Count="57">
+    <Units Count="61">
       <Unit0>
         <Filename Value="mod_hello.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="mod_hello"/>
-        <CursorPos X="5" Y="22"/>
-        <TopLine Value="108"/>
+        <CursorPos X="12" Y="54"/>
+        <TopLine Value="47"/>
         <EditorIndex Value="0"/>
         <UsageCount Value="36"/>
         <Loaded Value="True"/>
@@ -40,446 +60,486 @@
         <UsageCount Value="10"/>
       </Unit1>
       <Unit2>
-        <Filename Value="httpd_2_0/httpd.inc"/>
-        <CursorPos X="1" Y="13"/>
-        <TopLine Value="1"/>
+        <Filename Value="httpd_2_0\httpd.inc"/>
+        <CursorPos X="21" Y="840"/>
+        <TopLine Value="825"/>
+        <EditorIndex Value="7"/>
         <UsageCount Value="10"/>
+        <Loaded Value="True"/>
       </Unit2>
       <Unit3>
-        <Filename Value="httpd_2_0/apr/apr_buckets.inc"/>
+        <Filename Value="httpd_2_0\apr\apr_buckets.inc"/>
         <CursorPos X="14" Y="9"/>
         <TopLine Value="1"/>
         <UsageCount Value="10"/>
       </Unit3>
       <Unit4>
-        <Filename Value="httpd_2_0/http_log.inc"/>
-        <CursorPos X="1" Y="181"/>
-        <TopLine Value="153"/>
+        <Filename Value="httpd_2_0\http_log.inc"/>
+        <CursorPos X="1" Y="2"/>
+        <TopLine Value="1"/>
+        <EditorIndex Value="1"/>
         <UsageCount Value="10"/>
+        <Loaded Value="True"/>
       </Unit4>
       <Unit5>
-        <Filename Value="httpd_2_0/aprutil/apr_md5.inc"/>
+        <Filename Value="httpd_2_0\aprutil\apr_md5.inc"/>
         <CursorPos X="28" Y="128"/>
         <TopLine Value="123"/>
         <UsageCount Value="10"/>
       </Unit5>
       <Unit6>
-        <Filename Value="httpd_2_0/http_config.inc"/>
+        <Filename Value="httpd_2_0\http_config.inc"/>
         <CursorPos X="11" Y="160"/>
         <TopLine Value="138"/>
         <UsageCount Value="10"/>
       </Unit6>
       <Unit7>
-        <Filename Value="httpd_2_0/ap_mmn.inc"/>
+        <Filename Value="httpd_2_0\ap_mmn.inc"/>
         <CursorPos X="13" Y="76"/>
         <TopLine Value="75"/>
         <UsageCount Value="10"/>
       </Unit7>
       <Unit8>
-        <Filename Value="httpd_2_0/httpd.pas"/>
+        <Filename Value="httpd_2_0\httpd.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="httpd"/>
-        <CursorPos X="11" Y="163"/>
-        <TopLine Value="136"/>
+        <CursorPos X="8" Y="163"/>
+        <TopLine Value="138"/>
+        <EditorIndex Value="6"/>
         <UsageCount Value="35"/>
+        <Loaded Value="True"/>
       </Unit8>
       <Unit9>
-        <Filename Value="httpd_2_0/apr/apr_network_io.inc"/>
+        <Filename Value="httpd_2_0\apr\apr_network_io.inc"/>
         <CursorPos X="17" Y="197"/>
         <TopLine Value="178"/>
         <UsageCount Value="10"/>
       </Unit9>
       <Unit10>
-        <Filename Value="httpd_2_0/apr/apr.pas"/>
+        <Filename Value="httpd_2_0\apr\apr.pas"/>
         <UnitName Value="apr"/>
-        <CursorPos X="34" Y="96"/>
-        <TopLine Value="78"/>
-        <EditorIndex Value="4"/>
+        <CursorPos X="1" Y="161"/>
+        <TopLine Value="142"/>
+        <EditorIndex Value="5"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit10>
       <Unit11>
-        <Filename Value="../httpd-2.0.58/srclib/apr/include/apr_network_io.h"/>
+        <Filename Value="..\httpd-2.0.58\srclib\apr\include\apr_network_io.h"/>
         <CursorPos X="16" Y="212"/>
         <TopLine Value="18"/>
         <UsageCount Value="10"/>
         <SyntaxHighlighter Value="C++"/>
       </Unit11>
       <Unit12>
-        <Filename Value="../httpd-2.0.58/modules/arch/netware/mod_nw_ssl.c"/>
+        <Filename Value="..\httpd-2.0.58\modules\arch\netware\mod_nw_ssl.c"/>
         <CursorPos X="39" Y="79"/>
         <TopLine Value="79"/>
         <UsageCount Value="10"/>
         <SyntaxHighlighter Value="C++"/>
       </Unit12>
       <Unit13>
-        <Filename Value="httpd_1_3/httpd.pas"/>
+        <Filename Value="httpd_1_3\httpd.pas"/>
         <UnitName Value="httpd"/>
         <CursorPos X="21" Y="169"/>
         <TopLine Value="146"/>
         <UsageCount Value="16"/>
       </Unit13>
       <Unit14>
-        <Filename Value="httpd_1_3/ap_config.inc"/>
+        <Filename Value="httpd_1_3\ap_config.inc"/>
         <CursorPos X="1" Y="22"/>
         <TopLine Value="114"/>
         <UsageCount Value="15"/>
       </Unit14>
       <Unit15>
-        <Filename Value="httpd_1_3/ap_alloc.inc"/>
+        <Filename Value="httpd_1_3\ap_alloc.inc"/>
         <CursorPos X="4" Y="126"/>
         <TopLine Value="110"/>
         <UsageCount Value="12"/>
       </Unit15>
       <Unit16>
-        <Filename Value="httpd_1_3/http_config.inc"/>
+        <Filename Value="httpd_1_3\http_config.inc"/>
         <CursorPos X="1" Y="146"/>
         <TopLine Value="128"/>
         <UsageCount Value="14"/>
       </Unit16>
       <Unit17>
-        <Filename Value="httpd_2_0/ap_provider.inc"/>
+        <Filename Value="httpd_2_0\ap_provider.inc"/>
         <CursorPos X="34" Y="20"/>
         <TopLine Value="18"/>
         <UsageCount Value="10"/>
       </Unit17>
       <Unit18>
-        <Filename Value="httpd_1_3/buff.inc"/>
+        <Filename Value="httpd_1_3\buff.inc"/>
         <CursorPos X="1" Y="185"/>
         <TopLine Value="1"/>
         <UsageCount Value="11"/>
       </Unit18>
       <Unit19>
-        <Filename Value="httpd_1_3/ap.inc"/>
+        <Filename Value="httpd_1_3\ap.inc"/>
         <CursorPos X="3" Y="35"/>
         <TopLine Value="20"/>
         <UsageCount Value="11"/>
       </Unit19>
       <Unit20>
-        <Filename Value="httpd_1_3/httpd.inc"/>
+        <Filename Value="httpd_1_3\httpd.inc"/>
         <CursorPos X="14" Y="22"/>
         <TopLine Value="1"/>
         <UsageCount Value="14"/>
       </Unit20>
       <Unit21>
-        <Filename Value="../../../Apache/apache_1.3.37/src/include/httpd.h"/>
+        <Filename Value="..\..\apache_1.3.37\src\include\httpd.h"/>
         <CursorPos X="9" Y="215"/>
         <TopLine Value="197"/>
         <UsageCount Value="10"/>
         <SyntaxHighlighter Value="C++"/>
       </Unit21>
       <Unit22>
-        <Filename Value="../../../Apache/apache_1.3.37/src/support/suexec.h"/>
+        <Filename Value="..\..\apache_1.3.37\src\support\suexec.h"/>
         <CursorPos X="44" Y="54"/>
         <TopLine Value="36"/>
         <UsageCount Value="11"/>
         <SyntaxHighlighter Value="C++"/>
       </Unit22>
       <Unit23>
-        <Filename Value="../../../Apache/apache_1.3.37/src/modules/proxy/mod_proxy.h"/>
+        <Filename Value="..\..\apache_1.3.37\src\modules\proxy\mod_proxy.h"/>
         <CursorPos X="8" Y="296"/>
         <TopLine Value="276"/>
         <UsageCount Value="10"/>
         <SyntaxHighlighter Value="C++"/>
       </Unit23>
       <Unit24>
-        <Filename Value="../../../Apache/apache_1.3.37/src/include/ap_alloc.h"/>
+        <Filename Value="..\..\apache_1.3.37\src\include\ap_alloc.h"/>
         <CursorPos X="7" Y="180"/>
         <TopLine Value="155"/>
         <UsageCount Value="11"/>
         <SyntaxHighlighter Value="C++"/>
       </Unit24>
       <Unit25>
-        <Filename Value="../../../Apache/apache_1.3.37/src/include/ap_config.h"/>
+        <Filename Value="..\..\apache_1.3.37\src\include\ap_config.h"/>
         <CursorPos X="22" Y="22"/>
         <TopLine Value="7"/>
         <UsageCount Value="10"/>
         <SyntaxHighlighter Value="C++"/>
       </Unit25>
       <Unit26>
-        <Filename Value="httpd_1_3/util_uri.inc"/>
+        <Filename Value="httpd_1_3\util_uri.inc"/>
         <CursorPos X="4" Y="49"/>
         <TopLine Value="38"/>
         <UsageCount Value="11"/>
       </Unit26>
       <Unit27>
-        <Filename Value="../../../Apache/apache_1.3.37/src/include/util_uri.h"/>
+        <Filename Value="..\..\apache_1.3.37\src\include\util_uri.h"/>
         <CursorPos X="12" Y="53"/>
         <TopLine Value="45"/>
         <UsageCount Value="10"/>
         <SyntaxHighlighter Value="C++"/>
       </Unit27>
       <Unit28>
-        <Filename Value="../../../Apache/apache_1.3.37/src/include/http_config.h"/>
+        <Filename Value="..\..\apache_1.3.37\src\include\http_config.h"/>
         <CursorPos X="27" Y="174"/>
         <TopLine Value="126"/>
         <UsageCount Value="10"/>
         <SyntaxHighlighter Value="C++"/>
       </Unit28>
       <Unit29>
-        <Filename Value="httpd_1_3/http_core.inc"/>
+        <Filename Value="httpd_1_3\http_core.inc"/>
         <CursorPos X="1" Y="387"/>
         <TopLine Value="352"/>
         <UsageCount Value="14"/>
       </Unit29>
       <Unit30>
-        <Filename Value="httpd_1_3/http_request.inc"/>
+        <Filename Value="httpd_1_3\http_request.inc"/>
         <CursorPos X="78" Y="57"/>
         <TopLine Value="29"/>
         <UsageCount Value="11"/>
       </Unit30>
       <Unit31>
-        <Filename Value="httpd_2_0/pcreposix.inc"/>
+        <Filename Value="httpd_2_0\pcreposix.inc"/>
         <CursorPos X="1" Y="74"/>
         <TopLine Value="34"/>
         <UsageCount Value="10"/>
       </Unit31>
       <Unit32>
-        <Filename Value="httpd_1_3/hsregex.inc"/>
+        <Filename Value="httpd_1_3\hsregex.inc"/>
         <CursorPos X="1" Y="15"/>
         <TopLine Value="1"/>
         <UsageCount Value="11"/>
       </Unit32>
       <Unit33>
-        <Filename Value="../../../Apache/apache_1.3.37/src/regex/regex2.h"/>
+        <Filename Value="..\..\apache_1.3.37\src\regex\regex2.h"/>
         <CursorPos X="8" Y="115"/>
         <TopLine Value="82"/>
         <UsageCount Value="10"/>
         <SyntaxHighlighter Value="C++"/>
       </Unit33>
       <Unit34>
-        <Filename Value="httpd_1_3/http_log.inc"/>
+        <Filename Value="httpd_1_3\http_log.inc"/>
         <CursorPos X="11" Y="67"/>
         <TopLine Value="52"/>
         <UsageCount Value="10"/>
       </Unit34>
       <Unit35>
-        <Filename Value="httpd_1_3/http_main.inc"/>
+        <Filename Value="httpd_1_3\http_main.inc"/>
         <CursorPos X="27" Y="123"/>
         <TopLine Value="18"/>
         <UsageCount Value="13"/>
       </Unit35>
       <Unit36>
-        <Filename Value="httpd_1_3/http_protocol.inc"/>
+        <Filename Value="httpd_1_3\http_protocol.inc"/>
         <CursorPos X="77" Y="108"/>
         <TopLine Value="85"/>
         <UsageCount Value="10"/>
       </Unit36>
       <Unit37>
-        <Filename Value="httpd_1_3/http_vhost.inc"/>
+        <Filename Value="httpd_1_3\http_vhost.inc"/>
         <CursorPos X="1" Y="33"/>
         <TopLine Value="10"/>
         <UsageCount Value="10"/>
       </Unit37>
       <Unit38>
-        <Filename Value="../../../Apache/apache_1.3.37/src/modules/example/mod_example.c"/>
+        <Filename Value="..\..\apache_1.3.37\src\modules\example\mod_example.c"/>
         <CursorPos X="7" Y="1011"/>
         <TopLine Value="1004"/>
         <UsageCount Value="13"/>
         <SyntaxHighlighter Value="C++"/>
       </Unit38>
       <Unit39>
-        <Filename Value="httpd_1_3/ap_mmn.inc"/>
+        <Filename Value="httpd_1_3\ap_mmn.inc"/>
         <CursorPos X="34" Y="208"/>
         <TopLine Value="192"/>
         <UsageCount Value="11"/>
       </Unit39>
       <Unit40>
-        <Filename Value="httpd_2_0/ap_config.inc"/>
+        <Filename Value="httpd_2_0\ap_config.inc"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
         <UsageCount Value="10"/>
       </Unit40>
       <Unit41>
-        <Filename Value="/usr/share/fpcsrc/rtl/linux/ptypes.inc"/>
+        <Filename Value="usr\share\fpcsrc\rtl\linux\ptypes.inc"/>
         <CursorPos X="5" Y="68"/>
         <TopLine Value="52"/>
         <UsageCount Value="10"/>
       </Unit41>
       <Unit42>
-        <Filename Value="httpd_2_2/http_main.inc"/>
+        <Filename Value="httpd_2_2\http_main.inc"/>
         <CursorPos X="1" Y="16"/>
         <TopLine Value="1"/>
-        <EditorIndex Value="1"/>
+        <EditorIndex Value="2"/>
         <UsageCount Value="11"/>
         <Loaded Value="True"/>
       </Unit42>
       <Unit43>
-        <Filename Value="httpd_2_2/httpd.inc"/>
+        <Filename Value="httpd_2_2\httpd.inc"/>
         <CursorPos X="10" Y="975"/>
         <TopLine Value="959"/>
-        <EditorIndex Value="2"/>
+        <EditorIndex Value="3"/>
         <UsageCount Value="11"/>
         <Loaded Value="True"/>
       </Unit43>
       <Unit44>
-        <Filename Value="httpd_2_2/httpd.pas"/>
+        <Filename Value="httpd_2_2\httpd.pas"/>
         <UnitName Value="httpd"/>
         <CursorPos X="81" Y="89"/>
         <TopLine Value="82"/>
-        <EditorIndex Value="6"/>
+        <EditorIndex Value="11"/>
         <UsageCount Value="11"/>
         <Loaded Value="True"/>
       </Unit44>
       <Unit45>
-        <Filename Value="httpd_2_2/http_log.inc"/>
+        <Filename Value="httpd_2_2\http_log.inc"/>
         <CursorPos X="1" Y="15"/>
         <TopLine Value="1"/>
-        <EditorIndex Value="7"/>
+        <EditorIndex Value="12"/>
         <UsageCount Value="11"/>
         <Loaded Value="True"/>
       </Unit45>
       <Unit46>
-        <Filename Value="httpd_2_2/http_protocol.inc"/>
+        <Filename Value="httpd_2_2\http_protocol.inc"/>
         <CursorPos X="1" Y="15"/>
         <TopLine Value="1"/>
-        <EditorIndex Value="8"/>
+        <EditorIndex Value="13"/>
         <UsageCount Value="11"/>
         <Loaded Value="True"/>
       </Unit46>
       <Unit47>
-        <Filename Value="httpd_2_2/http_vhost.inc"/>
+        <Filename Value="httpd_2_2\http_vhost.inc"/>
         <CursorPos X="30" Y="52"/>
         <TopLine Value="1"/>
-        <EditorIndex Value="9"/>
+        <EditorIndex Value="14"/>
         <UsageCount Value="11"/>
         <Loaded Value="True"/>
       </Unit47>
       <Unit48>
-        <Filename Value="httpd_2_2/apr/apr_network_io.inc"/>
+        <Filename Value="httpd_2_2\apr\apr_network_io.inc"/>
         <CursorPos X="14" Y="197"/>
         <TopLine Value="178"/>
         <UsageCount Value="10"/>
       </Unit48>
       <Unit49>
-        <Filename Value="httpd_2_2/apr/apr.pas"/>
+        <Filename Value="httpd_2_2\apr\apr.pas"/>
         <UnitName Value="apr"/>
         <CursorPos X="15" Y="137"/>
         <TopLine Value="52"/>
         <UsageCount Value="10"/>
       </Unit49>
       <Unit50>
-        <Filename Value="../../../Apache/httpd-2.2.3/srclib/apr/include/apr_ring.h"/>
+        <Filename Value="..\..\httpd-2.2.3\srclib\apr\include\apr_ring.h"/>
         <CursorPos X="9" Y="70"/>
         <TopLine Value="52"/>
         <UsageCount Value="10"/>
         <SyntaxHighlighter Value="C++"/>
       </Unit50>
       <Unit51>
-        <Filename Value="../../../Apache/httpd-2.2.3/srclib/apr/include/apr_mmap.h"/>
+        <Filename Value="..\..\httpd-2.2.3\srclib\apr\include\apr_mmap.h"/>
         <CursorPos X="5" Y="85"/>
         <TopLine Value="67"/>
         <UsageCount Value="10"/>
         <SyntaxHighlighter Value="C++"/>
       </Unit51>
       <Unit52>
-        <Filename Value="httpd_2_0/apr/apr_poll.inc"/>
+        <Filename Value="httpd_2_0\apr\apr_poll.inc"/>
         <CursorPos X="84" Y="212"/>
         <TopLine Value="196"/>
-        <EditorIndex Value="3"/>
+        <EditorIndex Value="4"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit52>
       <Unit53>
-        <Filename Value="../../../Apache/httpd-2.0.58/include/http_config.h"/>
+        <Filename Value="..\..\httpd-2.0.58\include\http_config.h"/>
         <CursorPos X="1" Y="75"/>
         <TopLine Value="57"/>
         <UsageCount Value="10"/>
         <SyntaxHighlighter Value="C++"/>
       </Unit53>
       <Unit54>
-        <Filename Value="../../../Apache/httpd-2.0.58/include/http_core.h"/>
+        <Filename Value="..\..\httpd-2.0.58\include\http_core.h"/>
         <CursorPos X="10" Y="585"/>
         <TopLine Value="570"/>
         <UsageCount Value="10"/>
         <SyntaxHighlighter Value="C++"/>
       </Unit54>
       <Unit55>
-        <Filename Value="httpd_2_0/http_core.inc"/>
+        <Filename Value="httpd_2_0\http_core.inc"/>
         <CursorPos X="16" Y="650"/>
         <TopLine Value="634"/>
         <UsageCount Value="10"/>
       </Unit55>
       <Unit56>
-        <Filename Value="httpd_2_0/apr/apr_dso.inc"/>
+        <Filename Value="httpd_2_0\apr\apr_dso.inc"/>
         <CursorPos X="1" Y="81"/>
         <TopLine Value="63"/>
-        <EditorIndex Value="5"/>
+        <EditorIndex Value="9"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit56>
+      <Unit57>
+        <Filename Value="..\..\..\lazarus16\fpcsrc\rtl\win32\winsock.pp"/>
+        <UnitName Value="winsock"/>
+        <CursorPos X="14" Y="220"/>
+        <TopLine Value="210"/>
+        <UsageCount Value="10"/>
+      </Unit57>
+      <Unit58>
+        <Filename Value="..\..\..\lazarus16\fpcsrc\rtl\win32\wininc\struct.inc"/>
+        <CursorPos X="14" Y="6"/>
+        <TopLine Value="1"/>
+        <UsageCount Value="10"/>
+      </Unit58>
+      <Unit59>
+        <Filename Value="httpd_2_0\util_cfgtree.inc"/>
+        <CursorPos X="13" Y="24"/>
+        <TopLine Value="9"/>
+        <EditorIndex Value="10"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit59>
+      <Unit60>
+        <Filename Value="httpd_2_0\util_filter.inc"/>
+        <CursorPos X="11" Y="95"/>
+        <TopLine Value="80"/>
+        <EditorIndex Value="8"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit60>
     </Units>
-    <JumpHistory Count="15" HistoryIndex="14">
+    <JumpHistory Count="16" HistoryIndex="15">
       <Position1>
-        <Filename Value="httpd_2_0/apr/apr_poll.inc"/>
-        <Caret Line="3" Column="1" TopLine="1"/>
+        <Filename Value="httpd_2_0\apr\apr.pas"/>
+        <Caret Line="96" Column="34" TopLine="78"/>
       </Position1>
       <Position2>
-        <Filename Value="httpd_2_0/apr/apr_poll.inc"/>
-        <Caret Line="63" Column="3" TopLine="47"/>
+        <Filename Value="httpd_2_0\apr\apr.pas"/>
+        <Caret Line="126" Column="8" TopLine="102"/>
       </Position2>
       <Position3>
-        <Filename Value="httpd_2_0/apr/apr_poll.inc"/>
-        <Caret Line="64" Column="1" TopLine="47"/>
+        <Filename Value="httpd_2_0\apr\apr.pas"/>
+        <Caret Line="122" Column="7" TopLine="107"/>
       </Position3>
       <Position4>
-        <Filename Value="httpd_2_0/apr/apr_poll.inc"/>
-        <Caret Line="63" Column="3" TopLine="47"/>
+        <Filename Value="mod_hello.lpr"/>
+        <Caret Line="18" Column="19" TopLine="32"/>
       </Position4>
       <Position5>
-        <Filename Value="httpd_2_0/apr/apr_poll.inc"/>
-        <Caret Line="59" Column="3" TopLine="47"/>
+        <Filename Value="httpd_2_0\apr\apr.pas"/>
+        <Caret Line="119" Column="11" TopLine="17"/>
       </Position5>
       <Position6>
-        <Filename Value="httpd_2_0/apr/apr_poll.inc"/>
-        <Caret Line="71" Column="16" TopLine="55"/>
+        <Filename Value="httpd_2_0\apr\apr.pas"/>
+        <Caret Line="113" Column="8" TopLine="98"/>
       </Position6>
       <Position7>
-        <Filename Value="httpd_2_0/apr/apr_poll.inc"/>
-        <Caret Line="68" Column="14" TopLine="54"/>
+        <Filename Value="httpd_2_0\util_cfgtree.inc"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position7>
       <Position8>
-        <Filename Value="httpd_2_0/apr/apr_poll.inc"/>
-        <Caret Line="71" Column="27" TopLine="55"/>
+        <Filename Value="httpd_2_0\util_cfgtree.inc"/>
+        <Caret Line="24" Column="13" TopLine="9"/>
       </Position8>
       <Position9>
-        <Filename Value="httpd_2_0/apr/apr_poll.inc"/>
-        <Caret Line="84" Column="49" TopLine="68"/>
+        <Filename Value="httpd_2_0\util_filter.inc"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position9>
       <Position10>
-        <Filename Value="httpd_2_0/apr/apr_poll.inc"/>
-        <Caret Line="67" Column="1" TopLine="51"/>
+        <Filename Value="httpd_2_0\util_filter.inc"/>
+        <Caret Line="95" Column="11" TopLine="80"/>
       </Position10>
       <Position11>
-        <Filename Value="httpd_2_0/apr/apr_poll.inc"/>
-        <Caret Line="109" Column="20" TopLine="93"/>
+        <Filename Value="httpd_2_0\httpd.inc"/>
+        <Caret Line="13" Column="1" TopLine="1"/>
       </Position11>
       <Position12>
-        <Filename Value="httpd_2_0/apr/apr_poll.inc"/>
-        <Caret Line="189" Column="50" TopLine="173"/>
+        <Filename Value="httpd_2_0\httpd.pas"/>
+        <Caret Line="163" Column="11" TopLine="136"/>
       </Position12>
       <Position13>
-        <Filename Value="httpd_2_0/apr/apr_poll.inc"/>
-        <Caret Line="211" Column="53" TopLine="195"/>
+        <Filename Value="httpd_2_0\httpd.pas"/>
+        <Caret Line="156" Column="13" TopLine="138"/>
       </Position13>
       <Position14>
-        <Filename Value="httpd_2_0/apr/apr_poll.inc"/>
-        <Caret Line="202" Column="23" TopLine="190"/>
+        <Filename Value="httpd_2_0\httpd.pas"/>
+        <Caret Line="163" Column="17" TopLine="138"/>
       </Position14>
       <Position15>
-        <Filename Value="httpd_2_0/apr/apr_poll.inc"/>
-        <Caret Line="212" Column="84" TopLine="196"/>
+        <Filename Value="mod_hello.lpr"/>
+        <Caret Line="110" Column="25" TopLine="95"/>
       </Position15>
+      <Position16>
+        <Filename Value="mod_hello.lpr"/>
+        <Caret Line="54" Column="12" TopLine="47"/>
+      </Position16>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="5"/>
+    <PathDelim Value="\"/>
     <Target>
       <Filename Value="mod_hello.so"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="httpd_2_0/;httpd_2_0/apr/;httpd_2_0/aprutil/"/>
-      <SrcPath Value="httpd_2_0/;httpd_2_0/apr/;httpd_2_0/aprutil/"/>
+      <OtherUnitFiles Value="httpd_2_0\;httpd_2_0\apr\;httpd_2_0\aprutil\"/>
+      <SrcPath Value="httpd_2_0\;httpd_2_0\apr\;httpd_2_0\aprutil\"/>
     </SearchPaths>
     <CodeGeneration>
       <Generate Value="Faster"/>
diff --git a/httpd/mod_hello.lpr b/httpd/mod_hello.lpr
index aa8bebbd7..d238086a0 100644
--- a/httpd/mod_hello.lpr
+++ b/httpd/mod_hello.lpr
@@ -15,7 +15,7 @@ library mod_hello;
   {$DEFINE WINDOWS}
 {$ENDIF}
 
-{$define Apache2_2}
+{$define Apache2_0}
 
 uses SysUtils, httpd {$ifndef Apache1_3}, apr{$endif};