From 6cdf023a21cbc7e357d9bb65bf389bd3acfd3be0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= Date: Mon, 6 Mar 2023 14:57:56 +0100 Subject: [PATCH] * Dotted filenames for package libffi --- packages/libffi/namespaced/Api.Ffi.manager.pp | 3 +++ packages/libffi/namespaced/Api.Ffi.pp | 3 +++ packages/libffi/namespaces.lst | 4 ++++ packages/libffi/src/ffi.manager.pp | 7 +++++++ packages/libffi/src/ffi.pp | 7 +++++++ 5 files changed, 24 insertions(+) create mode 100644 packages/libffi/namespaced/Api.Ffi.manager.pp create mode 100644 packages/libffi/namespaced/Api.Ffi.pp create mode 100644 packages/libffi/namespaces.lst diff --git a/packages/libffi/namespaced/Api.Ffi.manager.pp b/packages/libffi/namespaced/Api.Ffi.manager.pp new file mode 100644 index 0000000000..fbac2ff517 --- /dev/null +++ b/packages/libffi/namespaced/Api.Ffi.manager.pp @@ -0,0 +1,3 @@ +unit Api.Ffi.manager; +{$DEFINE FPC_DOTTEDUNITS} +{$i ffi.manager.pp} diff --git a/packages/libffi/namespaced/Api.Ffi.pp b/packages/libffi/namespaced/Api.Ffi.pp new file mode 100644 index 0000000000..9fe0e3b532 --- /dev/null +++ b/packages/libffi/namespaced/Api.Ffi.pp @@ -0,0 +1,3 @@ +unit Api.Ffi; +{$DEFINE FPC_DOTTEDUNITS} +{$i ffi.pp} diff --git a/packages/libffi/namespaces.lst b/packages/libffi/namespaces.lst new file mode 100644 index 0000000000..47378cb515 --- /dev/null +++ b/packages/libffi/namespaces.lst @@ -0,0 +1,4 @@ +src/ffi.pp=namespaced/Api.Ffi.pp +{s*:src/}=namespaced/ +{i+:src/} +src/ffi.manager.pp=namespaced/Api.Ffi.manager.pp diff --git a/packages/libffi/src/ffi.manager.pp b/packages/libffi/src/ffi.manager.pp index 502587c042..e12ea72da2 100644 --- a/packages/libffi/src/ffi.manager.pp +++ b/packages/libffi/src/ffi.manager.pp @@ -12,7 +12,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. **********************************************************************} +{$IFNDEF FPC_DOTTEDUNITS} unit ffi.manager; +{$ENDIF FPC_DOTTEDUNITS} {$mode objfpc}{$H+} @@ -20,8 +22,13 @@ interface implementation +{$IFDEF FPC_DOTTEDUNITS} +uses + System.TypInfo, System.Rtti, Api.Ffi; +{$ELSE FPC_DOTTEDUNITS} uses TypInfo, Rtti, ffi; +{$ENDIF FPC_DOTTEDUNITS} type Tpffi_typeArray = array of pffi_type; diff --git a/packages/libffi/src/ffi.pp b/packages/libffi/src/ffi.pp index fabff9cd3c..547a883e24 100644 --- a/packages/libffi/src/ffi.pp +++ b/packages/libffi/src/ffi.pp @@ -39,12 +39,19 @@ http://gcc.gnu.org/ml/java/1999-q3/msg00174.html -------------------------------------------------------------------- *) +{$IFNDEF FPC_DOTTEDUNITS} unit ffi; +{$ENDIF FPC_DOTTEDUNITS} interface +{$IFDEF FPC_DOTTEDUNITS} +uses + System.CTypes; +{$ELSE FPC_DOTTEDUNITS} uses ctypes; +{$ENDIF FPC_DOTTEDUNITS} { from the various ffitarget.h