From 71226c3bb2fd9ba8139a544785d0b958e2217bcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= Date: Mon, 6 Mar 2023 14:58:05 +0100 Subject: [PATCH] * Dotted filenames for package httpd24 --- packages/httpd24/namespaced/Api.Httpd24.Apr.pas | 3 +++ packages/httpd24/namespaced/Api.Httpd24.pas | 3 +++ packages/httpd24/namespaces.lst | 6 ++++++ packages/httpd24/src/apr/apr24.pas | 12 ++++++++++++ packages/httpd24/src/httpd24.pas | 12 ++++++++++++ 5 files changed, 36 insertions(+) create mode 100644 packages/httpd24/namespaced/Api.Httpd24.Apr.pas create mode 100644 packages/httpd24/namespaced/Api.Httpd24.pas create mode 100644 packages/httpd24/namespaces.lst diff --git a/packages/httpd24/namespaced/Api.Httpd24.Apr.pas b/packages/httpd24/namespaced/Api.Httpd24.Apr.pas new file mode 100644 index 0000000000..3f3be6748d --- /dev/null +++ b/packages/httpd24/namespaced/Api.Httpd24.Apr.pas @@ -0,0 +1,3 @@ +unit Api.Httpd24.Apr; +{$DEFINE FPC_DOTTEDUNITS} +{$i apr24.pas} diff --git a/packages/httpd24/namespaced/Api.Httpd24.pas b/packages/httpd24/namespaced/Api.Httpd24.pas new file mode 100644 index 0000000000..292adecb3b --- /dev/null +++ b/packages/httpd24/namespaced/Api.Httpd24.pas @@ -0,0 +1,3 @@ +unit Api.Httpd24; +{$DEFINE FPC_DOTTEDUNITS} +{$i httpd24.pas} diff --git a/packages/httpd24/namespaces.lst b/packages/httpd24/namespaces.lst new file mode 100644 index 0000000000..98230b36b1 --- /dev/null +++ b/packages/httpd24/namespaces.lst @@ -0,0 +1,6 @@ +src/httpd24.pas=namespaced/Api.Httpd24.pas +{s*:src/}=namespaced/ +{i+:src/} +src/apr/apr24.pas=namespaced/Api.Httpd24.Apr.pas +{s*:src/apr/}=namespaced/ +{i+:src/apr/} diff --git a/packages/httpd24/src/apr/apr24.pas b/packages/httpd24/src/apr/apr24.pas index 857c9cd397..d76e52a942 100644 --- a/packages/httpd24/src/apr/apr24.pas +++ b/packages/httpd24/src/apr/apr24.pas @@ -13,7 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. } +{$IFNDEF FPC_DOTTEDUNITS} unit apr24; +{$ENDIF FPC_DOTTEDUNITS} {$ifdef fpc} {$mode delphi} {$H-} @@ -28,6 +30,15 @@ unit apr24; interface +{$IFDEF FPC_DOTTEDUNITS} +uses +{$ifdef Windows} + WinApi.Windows, +{$ELSE} + UnixApi.Types, +{$ENDIF} + System.SysUtils, System.CTypes; +{$ELSE FPC_DOTTEDUNITS} uses {$ifdef WINDOWS} Windows, @@ -35,6 +46,7 @@ uses UnixType, {$ENDIF} SysUtils, ctypes; +{$ENDIF FPC_DOTTEDUNITS} const {$IFDEF WINDOWS} diff --git a/packages/httpd24/src/httpd24.pas b/packages/httpd24/src/httpd24.pas index f2ed475572..eb0dde74c6 100644 --- a/packages/httpd24/src/httpd24.pas +++ b/packages/httpd24/src/httpd24.pas @@ -42,7 +42,9 @@ * @defgroup APACHE_CORE_DAEMON HTTP Daemon Routine * @ } +{$IFNDEF FPC_DOTTEDUNITS} unit httpd24; +{$ENDIF FPC_DOTTEDUNITS} {$ifdef fpc} {$mode delphi} @@ -80,6 +82,15 @@ unit httpd24; interface +{$IFDEF FPC_DOTTEDUNITS} +uses +{$ifdef Windows} + WinApi.Windows, +{$ELSE} + UnixApi.Types, +{$ENDIF} + System.CTypes, Api.HttpD24.Apr; +{$ELSE FPC_DOTTEDUNITS} uses {$ifdef WINDOWS} Windows, @@ -87,6 +98,7 @@ uses UnixType, {$ENDIF} ctypes, apr24; +{$ENDIF FPC_DOTTEDUNITS} const {$ifndef fpc}