Browse Source

* Dotted filenames for package httpd22

Michaël Van Canneyt 2 years ago
parent
commit
95654bcaa5

+ 3 - 0
packages/httpd22/namespaced/Api.Httpd22.Apr.pas

@@ -0,0 +1,3 @@
+unit Api.Httpd22.Apr;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i apr.pas}

+ 3 - 0
packages/httpd22/namespaced/Api.Httpd22.Apriconv.pas

@@ -0,0 +1,3 @@
+unit Api.Httpd22.Apriconv;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i apriconv.pas}

+ 3 - 0
packages/httpd22/namespaced/Api.Httpd22.Aprutil.pas

@@ -0,0 +1,3 @@
+unit Api.Httpd22.Aprutil;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i aprutil.pas}

+ 3 - 0
packages/httpd22/namespaced/Api.Httpd22.pas

@@ -0,0 +1,3 @@
+unit Api.Httpd22;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i httpd.pas}

+ 12 - 0
packages/httpd22/namespaces.lst

@@ -0,0 +1,12 @@
+src/aprutil/aprutil.pas=namespaced/Api.Httpd22.Aprutil.pas
+{s*:src/aprutil/}=namespaced/
+{i+:src/aprutil/}
+src/apriconv/apriconv.pas=namespaced/Api.Httpd22.Apriconv.pas
+{s*:src/apriconv/}=namespaced/
+{i+:src/apriconv/}
+src/apr/apr.pas=namespaced/Api.Httpd22.Apr.pas
+{s*:src/apr/}=namespaced/
+{i+:src/apr/}
+src/httpd.pas=namespaced/Api.Httpd22.pas
+{s*:src/}=namespaced/
+{i+:src/}

+ 12 - 0
packages/httpd22/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
 
@@ -41,6 +43,15 @@ interface
   {$PACKRECORDS C}
 {$endif}
 
+{$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,
@@ -48,6 +59,7 @@ uses
   UnixType,
 {$ENDIF}
   SysUtils, ctypes;
+{$ENDIF FPC_DOTTEDUNITS}
   
 const
 {$IFDEF WINDOWS}

+ 6 - 0
packages/httpd22/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.Httpd22.Apr;
+{$ELSE FPC_DOTTEDUNITS}
 uses apr;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
 {$IFDEF WINDOWS}

+ 10 - 0
packages/httpd22/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.Httpd22.Apr, System.CTypes;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 {$ifdef WINDOWS}
   Windows,
 {$ENDIF}
   apr, ctypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
 {$IFDEF WINDOWS}

+ 12 - 0
packages/httpd22/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}
@@ -45,6 +47,15 @@ unit httpd;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+{$ifdef Windows}
+  WinApi.Windows,
+{$ELSE}
+  UnixApi.Types,
+{$ENDIF}
+  Api.Httpd22.Apr, Api.Httpd22.Aprutil, System.CTypes;
+{$ELSE FPC_DOTTEDUNITS}
 uses
 {$ifdef WINDOWS}
   Windows,
@@ -52,6 +63,7 @@ uses
   UnixType,
 {$ENDIF}
   apr, aprutil, ctypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
 {$ifndef fpc}