* Avoid nameclash in apr too

git-svn-id: trunk@23207 -

.gitattributes

@@ -4127,7 +4127,7 @@ packages/httpd24/src/ap_expr.inc svneol=native#text/plain
 packages/httpd24/src/ap_mmn.inc svneol=native#text/plain
 packages/httpd24/src/ap_regex.inc svneol=native#text/plain
 packages/httpd24/src/ap_release.inc svneol=native#text/plain
-packages/httpd24/src/apr/apr.pas svneol=native#text/plain
+packages/httpd24/src/apr/apr24.pas svneol=native#text/plain
 packages/httpd24/src/apr/apr_allocator.inc svneol=native#text/plain
 packages/httpd24/src/apr/apr_errno.inc svneol=native#text/plain
 packages/httpd24/src/apr/apr_file_info.inc svneol=native#text/plain

packages/httpd24/fpmake.pp

@@ -34,7 +34,7 @@ begin
 
 //    P.Dependencies.Add('x11');
 
-    T:=P.Targets.AddUnit('apr.pas');
+    T:=P.Targets.AddUnit('apr24.pas');
       with T.Dependencies do
         begin
           AddInclude('apr_errno.inc');
@@ -63,7 +63,7 @@ begin
           AddInclude('http_protocol.inc');
           AddInclude('aprutil/apr_buckets.inc');
           AddInclude('aprutil/apr_uri.inc');
-          AddUnit('apr');
+          AddUnit('apr24');
         end;
     P.ExamplePath.Add('examples');
     T:=P.Targets.AddExampleProgram('mod_hello.pp');

packages/httpd24/src/apr/apr.pas → packages/httpd24/src/apr/apr24.pas

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
   }
-unit apr;
+unit apr24;
 {$ifdef fpc}
   {$mode delphi}{$H+}
 {$endif}

packages/httpd24/src/httpd24.pas

@@ -81,7 +81,7 @@ uses
 {$ELSE}
   UnixType,
 {$ENDIF}
-  ctypes, apr;
+  ctypes, apr24;
 
 const
 {$ifndef fpc}