diff --git a/rtl/inc/dynlib.inc b/rtl/inc/dynlib.inc index 989ad0baf2..57244b58f3 100644 --- a/rtl/inc/dynlib.inc +++ b/rtl/inc/dynlib.inc @@ -89,13 +89,13 @@ end; {$endif not FPCRTL_FILESYSTEM_TWO_BYTE_API} -Function GetProcedureAddress(Lib : TLibHandle; const ProcName : AnsiString) : Pointer; +Function GetProcedureAddress(Lib : TLibHandle; const ProcName : AnsiString) : {$ifdef cpui8086}FarPointer{$else}Pointer{$endif}; begin Result:=CurrentDLM.GetProcAddress(Lib, ProcName); end; -Function GetProcedureAddress(Lib : TLibHandle; Ordinal : TOrdinalEntry) : Pointer; +Function GetProcedureAddress(Lib : TLibHandle; Ordinal : TOrdinalEntry) : {$ifdef cpui8086}FarPointer{$else}Pointer{$endif}; begin if Assigned(CurrentDLM.GetProcAddressOrdinal) then Result:=CurrentDLM.GetProcAddressOrdinal(Lib, Ordinal) @@ -122,7 +122,7 @@ begin end; -Function GetProcAddress(Lib : TLibHandle; const ProcName : AnsiString) : Pointer; +Function GetProcAddress(Lib : TLibHandle; const ProcName : AnsiString) : {$ifdef cpui8086}FarPointer{$else}Pointer{$endif}; begin Result:=GetProcedureAddress(Lib,Procname); end; @@ -180,12 +180,12 @@ begin NoDynLibsError; end; -function NoGetProcAddress(Lib: TLibHandle; const Proc: AnsiString): Pointer; {$ifndef ver2_6}noreturn;{$endif} +function NoGetProcAddress(Lib: TLibHandle; const Proc: AnsiString): {$ifdef cpui8086}FarPointer{$else}Pointer{$endif}; {$ifndef ver2_6}noreturn;{$endif} begin NoDynLibsError; end; -function NoGetProcAddressOrdinal(Lib: TLibHandle; Ordinal: TOrdinalEntry): Pointer; {$ifndef ver2_6}noreturn;{$endif} +function NoGetProcAddressOrdinal(Lib: TLibHandle; Ordinal: TOrdinalEntry): {$ifdef cpui8086}FarPointer{$else}Pointer{$endif}; {$ifndef ver2_6}noreturn;{$endif} begin NoDynLibsError; end; diff --git a/rtl/inc/dynlibh.inc b/rtl/inc/dynlibh.inc index 3862f655a0..e89391b3d6 100644 --- a/rtl/inc/dynlibh.inc +++ b/rtl/inc/dynlibh.inc @@ -32,8 +32,8 @@ type TLoadLibraryUHandler = function(const Name: UnicodeString): TLibHandle; TLoadLibraryAHandler = function(const Name: RawByteString): TLibHandle; - TGetProcAddressHandler = function(Lib: TLibHandle; const ProcName: AnsiString): Pointer; - TGetProcAddressOrdinalHandler = function(Lib: TLibHandle; Ordinal: TOrdinalEntry): Pointer; + TGetProcAddressHandler = function(Lib: TLibHandle; const ProcName: AnsiString): {$ifdef cpui8086}FarPointer{$else}Pointer{$endif}; + TGetProcAddressOrdinalHandler = function(Lib: TLibHandle; Ordinal: TOrdinalEntry): {$ifdef cpui8086}FarPointer{$else}Pointer{$endif}; TUnloadLibraryHandler = function(Lib: TLibHandle): Boolean; TGetLoadErrorStrHandler = function: String; @@ -51,15 +51,15 @@ Function LoadLibrary(const Name : RawByteString) : TLibHandle; Function SafeLoadLibrary(const Name : UnicodeString) : TLibHandle; Function LoadLibrary(const Name : UnicodeString) : TLibHandle; -Function GetProcedureAddress(Lib : TlibHandle; const ProcName : AnsiString) : Pointer; -Function GetProcedureAddress(Lib : TLibHandle; Ordinal: TOrdinalEntry) : Pointer; +Function GetProcedureAddress(Lib : TlibHandle; const ProcName : AnsiString) : {$ifdef cpui8086}FarPointer{$else}Pointer{$endif}; +Function GetProcedureAddress(Lib : TLibHandle; Ordinal: TOrdinalEntry) : {$ifdef cpui8086}FarPointer{$else}Pointer{$endif}; Function UnloadLibrary(Lib : TLibHandle) : Boolean; Function GetLoadErrorStr: string; // Kylix/Delphi compability Function FreeLibrary(Lib : TLibHandle) : Boolean; inline; -Function GetProcAddress(Lib : TlibHandle; const ProcName : AnsiString) : Pointer; inline; +Function GetProcAddress(Lib : TlibHandle; const ProcName : AnsiString) : {$ifdef cpui8086}FarPointer{$else}Pointer{$endif}; inline; Procedure GetDynLibsManager (Var Manager : TDynLibsManager); Procedure SetDynLibsManager (Const New : TDynLibsManager);