From 182d807037c88ddb0b5798afdd5e348dddee7fe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= Date: Mon, 6 Mar 2023 14:58:07 +0100 Subject: [PATCH] * Dotted filenames for package httpd20 --- packages/httpd20/namespaced/Api.Httpd20.Apr.pas | 3 +++ packages/httpd20/namespaced/Api.Httpd20.Apriconv.pas | 3 +++ packages/httpd20/namespaced/Api.Httpd20.Aprutil.pas | 3 +++ packages/httpd20/namespaced/Api.Httpd20.Httpd.pas | 3 +++ packages/httpd20/namespaces.lst | 12 ++++++++++++ packages/httpd20/src/apr/apr.pas | 12 ++++++++++++ packages/httpd20/src/apriconv/apriconv.pas | 6 ++++++ packages/httpd20/src/aprutil/aprutil.pas | 10 ++++++++++ packages/httpd20/src/httpd.pas | 12 ++++++++++++ 9 files changed, 64 insertions(+) create mode 100644 packages/httpd20/namespaced/Api.Httpd20.Apr.pas create mode 100644 packages/httpd20/namespaced/Api.Httpd20.Apriconv.pas create mode 100644 packages/httpd20/namespaced/Api.Httpd20.Aprutil.pas create mode 100644 packages/httpd20/namespaced/Api.Httpd20.Httpd.pas create mode 100644 packages/httpd20/namespaces.lst diff --git a/packages/httpd20/namespaced/Api.Httpd20.Apr.pas b/packages/httpd20/namespaced/Api.Httpd20.Apr.pas new file mode 100644 index 0000000000..cf085fc6dc --- /dev/null +++ b/packages/httpd20/namespaced/Api.Httpd20.Apr.pas @@ -0,0 +1,3 @@ +unit Api.Httpd20.Apr; +{$DEFINE FPC_DOTTEDUNITS} +{$i apr.pas} diff --git a/packages/httpd20/namespaced/Api.Httpd20.Apriconv.pas b/packages/httpd20/namespaced/Api.Httpd20.Apriconv.pas new file mode 100644 index 0000000000..1b81a37b0d --- /dev/null +++ b/packages/httpd20/namespaced/Api.Httpd20.Apriconv.pas @@ -0,0 +1,3 @@ +unit Api.Httpd20.Apriconv; +{$DEFINE FPC_DOTTEDUNITS} +{$i apriconv.pas} diff --git a/packages/httpd20/namespaced/Api.Httpd20.Aprutil.pas b/packages/httpd20/namespaced/Api.Httpd20.Aprutil.pas new file mode 100644 index 0000000000..3e7e6236c7 --- /dev/null +++ b/packages/httpd20/namespaced/Api.Httpd20.Aprutil.pas @@ -0,0 +1,3 @@ +unit Api.Httpd20.Aprutil; +{$DEFINE FPC_DOTTEDUNITS} +{$i aprutil.pas} diff --git a/packages/httpd20/namespaced/Api.Httpd20.Httpd.pas b/packages/httpd20/namespaced/Api.Httpd20.Httpd.pas new file mode 100644 index 0000000000..f21a61ed0b --- /dev/null +++ b/packages/httpd20/namespaced/Api.Httpd20.Httpd.pas @@ -0,0 +1,3 @@ +unit Api.Httpd20.Httpd; +{$DEFINE FPC_DOTTEDUNITS} +{$i httpd.pas} diff --git a/packages/httpd20/namespaces.lst b/packages/httpd20/namespaces.lst new file mode 100644 index 0000000000..12ed5a9a1d --- /dev/null +++ b/packages/httpd20/namespaces.lst @@ -0,0 +1,12 @@ +src/aprutil/aprutil.pas=namespaced/Api.Httpd20.Aprutil.pas +{s*:src/aprutil/}=namespaced/ +{i+:src/aprutil/} +src/apriconv/apriconv.pas=namespaced/Api.Httpd20.Apriconv.pas +{s*:src/apriconv/}=namespaced/ +{i+:src/apriconv/} +src/apr/apr.pas=namespaced/Api.Httpd20.Apr.pas +{s*:src/apr/}=namespaced/ +{i+:src/apr/} +src/httpd.pas=namespaced/Api.Httpd20.Httpd.pas +{s*:src/}=namespaced/ +{i+:src/} diff --git a/packages/httpd20/src/apr/apr.pas b/packages/httpd20/src/apr/apr.pas index 35472ac37b..e6bac6cbfa 100644 --- a/packages/httpd20/src/apr/apr.pas +++ b/packages/httpd20/src/apr/apr.pas @@ -21,7 +21,9 @@ * See the License for the specific language governing permissions and * limitations under the License. } +{$IFNDEF FPC_DOTTEDUNITS} unit apr; +{$ENDIF FPC_DOTTEDUNITS} interface @@ -43,6 +45,15 @@ interface {$define Apache2_0} +{$IFDEF FPC_DOTTEDUNITS} +uses +{$ifdef Windows} + WinApi.Windows, WinApi.Winsock, +{$ELSE} + UnixApi.Types, +{$ENDIF} + System.SysUtils, System.CTypes; +{$ELSE FPC_DOTTEDUNITS} uses {$ifdef WINDOWS} Windows, winsock, @@ -50,6 +61,7 @@ uses UnixType, {$ENDIF} SysUtils, ctypes; +{$ENDIF FPC_DOTTEDUNITS} const {$IFDEF WINDOWS} diff --git a/packages/httpd20/src/apriconv/apriconv.pas b/packages/httpd20/src/apriconv/apriconv.pas index 1f819e23b5..b85b32cf84 100644 --- a/packages/httpd20/src/apriconv/apriconv.pas +++ b/packages/httpd20/src/apriconv/apriconv.pas @@ -21,7 +21,9 @@ * See the License for the specific language governing permissions and * limitations under the License. } +{$IFNDEF FPC_DOTTEDUNITS} unit apriconv; +{$ENDIF FPC_DOTTEDUNITS} interface @@ -41,7 +43,11 @@ interface {$PACKRECORDS C} {$endif} +{$IFDEF FPC_DOTTEDUNITS} +uses Api.Httpd20.Apr; +{$ELSE FPC_DOTTEDUNITS} uses apr; +{$ENDIF FPC_DOTTEDUNITS} const {$IFDEF WINDOWS} diff --git a/packages/httpd20/src/aprutil/aprutil.pas b/packages/httpd20/src/aprutil/aprutil.pas index e20627c5dc..ac9de0fc34 100644 --- a/packages/httpd20/src/aprutil/aprutil.pas +++ b/packages/httpd20/src/aprutil/aprutil.pas @@ -21,7 +21,9 @@ * See the License for the specific language governing permissions and * limitations under the License. } +{$IFNDEF FPC_DOTTEDUNITS} unit aprutil; +{$ENDIF FPC_DOTTEDUNITS} interface @@ -41,11 +43,19 @@ interface {$PACKRECORDS C} {$endif} +{$IFDEF FPC_DOTTEDUNITS} +uses +{$ifdef Windows} + WinApi.Windows, +{$ENDIF} + Api.Httpd20.Apr, System.CTypes; +{$ELSE FPC_DOTTEDUNITS} uses {$ifdef WINDOWS} Windows, {$ENDIF} apr, ctypes; +{$ENDIF FPC_DOTTEDUNITS} const {$IFDEF WINDOWS} diff --git a/packages/httpd20/src/httpd.pas b/packages/httpd20/src/httpd.pas index b02b429e4f..5a7fe729b0 100644 --- a/packages/httpd20/src/httpd.pas +++ b/packages/httpd20/src/httpd.pas @@ -21,7 +21,9 @@ * See the License for the specific language governing permissions and * limitations under the License. } +{$IFNDEF FPC_DOTTEDUNITS} unit httpd; +{$ENDIF FPC_DOTTEDUNITS} {$ifdef fpc} {$mode delphi}{$H+} @@ -43,6 +45,15 @@ unit httpd; interface +{$IFDEF FPC_DOTTEDUNITS} +uses +{$ifdef Windows} + WinApi.Windows, +{$ELSE} + UnixApi.Types, +{$ENDIF} + Api.Httpd20.Apr, Api.Httpd20.Aprutil, System.CTypes; +{$ELSE FPC_DOTTEDUNITS} uses {$ifdef WINDOWS} Windows, @@ -50,6 +61,7 @@ uses UnixType, {$ENDIF} apr, aprutil, ctypes; +{$ENDIF FPC_DOTTEDUNITS} const {$ifndef fpc}