paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-16 17:59:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Avoid nameclash in apr too

Browse Source 
git-svn-id: trunk@23207 -
This commit is contained in:
michael 2012-12-22 16:36:43 +00:00
parent 26bab0d14f
commit 5180320841
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -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

4
packages/httpd24/fpmake.pp
View File

@ -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');

2
packages/httpd24/src/apr/apr.pas → packages/httpd24/src/apr/apr24.pas
View File

@ -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}

2
packages/httpd24/src/httpd24.pas
View File

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