Removing a couple of unused units from the implementation 'uses' clau…

…se of IdHL7.pas. Undefining HAS_getifaddrs under Android.
costica-moldovanu · Mar 9, 2024 · d9656a0 · d9656a0
1 parent ba050d7
commit d9656a0
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 3 deletions.
diff --git a/Lib/Core/IdCompilerDefines.inc b/Lib/Core/IdCompilerDefines.inc
@@ -1683,6 +1683,10 @@
   {$DEFINE HAS_getifaddrs}
 {$ENDIF}
 
+{$IFDEF ANDROID}
+  {$UNDEF HAS_getifaddrs}
+{$ENDIF}
+
 {$IFDEF FPC_REQUIRES_PROPER_ALIGNMENT}
   {$DEFINE REQUIRES_PROPER_ALIGNMENT}
 {$ENDIF}

diff --git a/Lib/FCL/IdCompilerDefines.inc b/Lib/FCL/IdCompilerDefines.inc
@@ -1683,6 +1683,10 @@
   {$DEFINE HAS_getifaddrs}
 {$ENDIF}
 
+{$IFDEF ANDROID}
+  {$UNDEF HAS_getifaddrs}
+{$ENDIF}
+
 {$IFDEF FPC_REQUIRES_PROPER_ALIGNMENT}
   {$DEFINE REQUIRES_PROPER_ALIGNMENT}
 {$ENDIF}

diff --git a/Lib/Protocols/IdCompilerDefines.inc b/Lib/Protocols/IdCompilerDefines.inc
@@ -1683,6 +1683,10 @@
   {$DEFINE HAS_getifaddrs}
 {$ENDIF}
 
+{$IFDEF ANDROID}
+  {$UNDEF HAS_getifaddrs}
+{$ENDIF}
+
 {$IFDEF FPC_REQUIRES_PROPER_ALIGNMENT}
   {$DEFINE REQUIRES_PROPER_ALIGNMENT}
 {$ENDIF}

diff --git a/Lib/Protocols/IdHL7.pas b/Lib/Protocols/IdHL7.pas
@@ -489,8 +489,6 @@ implementation
     {$IFDEF OSX}
   CoreServices,
     {$ENDIF}
-  PosixSysSelect,
-  PosixSysTime,
   {$ENDIF}
   IdGlobalProtocols,
   IdResourceStringsProtocols;
@@ -1574,7 +1572,7 @@ function EncodeHL7Message(const AMsg: String; AByteEncoding: IIdTextEncoding
 begin
   {$IFDEF STRING_IS_ANSI}
   if AMsg <> '' then begin
-    LTemp := AAnsiEncoding.GetString(RawToBytes(AMsg[1], Length(AMsg)));
+    LTemp := AAnsiEncoding.GetString(PByte(PAnsiChar(AMsg)), Length(AMsg));
   end;
   LMsgLen := AByteEncoding.GetByteCount(LTemp);
   {$ELSE}

diff --git a/Lib/SuperCore/IdCompilerDefines.inc b/Lib/SuperCore/IdCompilerDefines.inc
@@ -1683,6 +1683,10 @@
   {$DEFINE HAS_getifaddrs}
 {$ENDIF}
 
+{$IFDEF ANDROID}
+  {$UNDEF HAS_getifaddrs}
+{$ENDIF}
+
 {$IFDEF FPC_REQUIRES_PROPER_ALIGNMENT}
   {$DEFINE REQUIRES_PROPER_ALIGNMENT}
 {$ENDIF}

diff --git a/Lib/System/IdCompilerDefines.inc b/Lib/System/IdCompilerDefines.inc
@@ -1683,6 +1683,10 @@
   {$DEFINE HAS_getifaddrs}
 {$ENDIF}
 
+{$IFDEF ANDROID}
+  {$UNDEF HAS_getifaddrs}
+{$ENDIF}
+
 {$IFDEF FPC_REQUIRES_PROPER_ALIGNMENT}
   {$DEFINE REQUIRES_PROPER_ALIGNMENT}
 {$ENDIF}