diff --git a/httpd/httpd_2_2/apr/apr.pas b/httpd/httpd_2_2/apr/apr.pas index beb8b5660..5e4314f98 100644 --- a/httpd/httpd_2_2/apr/apr.pas +++ b/httpd/httpd_2_2/apr/apr.pas @@ -51,7 +51,7 @@ uses const {$IFDEF WINDOWS} - LibAPR = 'libapr.dll'; + LibAPR = 'libapr-1.dll'; {$ELSE} LibAPR = ''; {$ENDIF} diff --git a/httpd/httpd_2_2/apr/apr_hash.inc b/httpd/httpd_2_2/apr/apr_hash.inc index bf78b4c98..82feb7cb5 100644 --- a/httpd/httpd_2_2/apr/apr_hash.inc +++ b/httpd/httpd_2_2/apr/apr_hash.inc @@ -65,7 +65,7 @@ type * The default hash function. } function apr_hashfunc_default(const key: PChar; klen: Papr_size_t): cuint; - cdecl; external LibAPR name LibNamePrefix + 'apr_hashfunc_default' + LibSuff8; + cdecl; external LibAPR name 'apr_hashfunc_default'; { * Create a hash table. diff --git a/httpd/loadmod.lpi b/httpd/loadmod.lpi index a832c9354..5e89e5026 100644 --- a/httpd/loadmod.lpi +++ b/httpd/loadmod.lpi @@ -9,6 +9,25 @@ + + + + + + + + + + + + + + + + + + + @@ -26,7 +45,7 @@ - + diff --git a/httpd/loadmod.lpr b/httpd/loadmod.lpr index 87148d06a..ae91b3d5d 100644 --- a/httpd/loadmod.lpr +++ b/httpd/loadmod.lpr @@ -9,7 +9,7 @@ uses Classes, Windows, sysutils; var Lib, Lib2: HINST; begin - Lib := LoadLibrary('C:\Programas\Apache\httpd\mod_example.so'); + Lib := LoadLibrary('C:\Programas\Apache\lazarus-ccr\httpd\mod_hello.so'); // Lib2 := LoadLibrary('C:\Programas\Apache\pmodules\newlib2.dll'); WriteLn(Lib); WriteLn(Lib2); diff --git a/httpd/mod_hello.lpi b/httpd/mod_hello.lpi index 70036588d..3ba33b37c 100644 --- a/httpd/mod_hello.lpi +++ b/httpd/mod_hello.lpi @@ -1,7 +1,7 @@ - + @@ -9,8 +9,28 @@ + + + + + + + + + + + + + + + + + + + + @@ -18,7 +38,7 @@ - + @@ -29,7 +49,7 @@ - + @@ -40,713 +60,724 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - - + + - + - - + + - + - + - + - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + + + - - - - - - - + + + + + + + - + - + - - + + - - - - - - - + + + + + + + - + - - + + - - + + - - + + - - + + - - - - - - - + - - - + + + - - + + + + + + + + - - - - - - - + + + + + + + + + - - - - - + + + + + - - - - - - - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - - - + + + - - + + + + + + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + - - + +