Browse Source

* Switched to using ansistring, because dynlibs use ansistrings

git-svn-id: trunk@22949 -
michael 12 years ago
parent
commit
5f053be31d

+ 2 - 2
packages/dblib/src/dblib.pp

@@ -380,7 +380,7 @@ procedure dbwinexit;
 function dbsetlcharset(login:PLOGINREC; charset:PChar):RETCODE;
 function dbsetlcharset(login:PLOGINREC; charset:PChar):RETCODE;
 function dbsetlsecure(login:PLOGINREC):RETCODE;
 function dbsetlsecure(login:PLOGINREC):RETCODE;
 
 
-function InitialiseDBLib(const LibraryName : shortstring = ''): integer;
+function InitialiseDBLib(const LibraryName : ansistring): integer;
 procedure ReleaseDBLib;
 procedure ReleaseDBLib;
 
 
 implementation
 implementation
@@ -391,7 +391,7 @@ uses SysUtils, Dynlibs;
 var DBLibLibraryHandle: TLibHandle;
 var DBLibLibraryHandle: TLibHandle;
     RefCount: integer;
     RefCount: integer;
 
 
-function InitialiseDBLib(const LibraryName : shortstring): integer;
+function InitialiseDBLib(const LibraryName : ansistring): integer;
 var libname : string;
 var libname : string;
 begin
 begin
   inc(RefCount);
   inc(RefCount);

+ 1 - 1
packages/fcl-db/src/sqldb/sqldb.pp

@@ -475,7 +475,7 @@ type
   TSQLConnectionClass = Class of TSQLConnection;
   TSQLConnectionClass = Class of TSQLConnection;
 
 
   { TConnectionDef }
   { TConnectionDef }
-  TLibraryLoadFunction = Function (Const S : ShortString) : Integer;
+  TLibraryLoadFunction = Function (Const S : AnsiString) : Integer;
   TLibraryUnLoadFunction = Procedure;
   TLibraryUnLoadFunction = Procedure;
   TConnectionDef = Class(TPersistent)
   TConnectionDef = Class(TPersistent)
     Class Function TypeName : String; virtual;
     Class Function TypeName : String; virtual;

+ 3 - 3
packages/ibase/src/ibase60.inc

@@ -2459,7 +2459,7 @@ var
   isc_suspend_window : function (_para1:PISC_STATUS; _para2:Pisc_win_handle):ISC_STATUS; extdecl;
   isc_suspend_window : function (_para1:PISC_STATUS; _para2:Pisc_win_handle):ISC_STATUS; extdecl;
 {$ENDIF}
 {$ENDIF}
 
 
-function InitialiseIBase60(Const LibraryName : String) : integer;
+function InitialiseIBase60(Const LibraryName : AnsiString) : integer;
 function InitialiseIBase60 : integer;
 function InitialiseIBase60 : integer;
 procedure ReleaseIBase60;
 procedure ReleaseIBase60;
 
 
@@ -2481,7 +2481,7 @@ var
   RefCount : integer;
   RefCount : integer;
   LoadedLibrary : String;
   LoadedLibrary : String;
 
 
-Function TryInitialiseIBase60(Const LibraryName : String) : integer;
+Function TryInitialiseIBase60(Const LibraryName : AnsiString) : integer;
 
 
 begin
 begin
   Result := 0;
   Result := 0;
@@ -2689,7 +2689,7 @@ begin
   Result := RefCount;
   Result := RefCount;
 end;
 end;
 
 
-function InitialiseIBase60(Const LibraryName : String) : integer;
+function InitialiseIBase60(Const LibraryName : AnsiString) : integer;
 
 
 begin
 begin
   Result := TryInitialiseIBase60(LibraryName);
   Result := TryInitialiseIBase60(LibraryName);

+ 5 - 5
packages/mysql/src/mysql.inc

@@ -1596,8 +1596,8 @@ uses
 {$endif}
 {$endif}
 
 
 {$IFDEF LinkDynamically}
 {$IFDEF LinkDynamically}
-Function InitialiseMysql(Const LibraryName : String) : Integer;
-Function InitialiseMysql(Const LibraryName : String; argc: cint; argv:PPchar = Nil; groups:PPchar = nil) : Integer;
+Function InitialiseMysql(Const LibraryName : AnsiString) : Integer;
+Function InitialiseMysql(Const LibraryName : AnsiString; argc: cint; argv:PPchar = Nil; groups:PPchar = nil) : Integer;
 Function InitialiseMysql(argc:cint = -1; argv:PPchar = nil; groups:PPchar = nil) : Integer;
 Function InitialiseMysql(argc:cint = -1; argv:PPchar = nil; groups:PPchar = nil) : Integer;
 Procedure ReleaseMysql;
 Procedure ReleaseMysql;
 
 
@@ -1617,7 +1617,7 @@ ResourceString
 var 
 var 
   RefCount : integer;
   RefCount : integer;
 
 
-Function TryInitialiseMysql(Const LibraryName: String; argc: cint; argv: PPchar; groups: PPchar) : Integer;
+Function TryInitialiseMysql(Const LibraryName: AnsiString; argc: cint; argv: PPchar; groups: PPchar) : Integer;
 
 
 begin
 begin
   Result := 0;
   Result := 0;
@@ -1756,13 +1756,13 @@ begin
   Result := RefCount;
   Result := RefCount;
 end;
 end;
 
 
-Function InitialiseMysql(Const LibraryName: String) : Integer;
+Function InitialiseMysql(Const LibraryName: AnsiString) : Integer;
 
 
 begin
 begin
   Result:=InitialiseMySQL(LibraryName,-1,Nil,Nil);
   Result:=InitialiseMySQL(LibraryName,-1,Nil,Nil);
 end;
 end;
 
 
-Function InitialiseMysql(Const LibraryName: String; argc: cint; argv: PPchar; groups:PPchar) : Integer;
+Function InitialiseMysql(Const LibraryName: AnsiString; argc: cint; argv: PPchar; groups:PPchar) : Integer;
 
 
 begin
 begin
   Result := TryInitialiseMysql(LibraryName,argc,argv,groups);
   Result := TryInitialiseMysql(LibraryName,argc,argv,groups);

+ 2 - 2
packages/postgres/src/postgres3dyn.pp

@@ -218,7 +218,7 @@ var
 { Get encoding id from environment variable PGCLIENTENCODING  }
 { Get encoding id from environment variable PGCLIENTENCODING  }
   PQenv2encoding: function :longint;cdecl;
   PQenv2encoding: function :longint;cdecl;
 
 
-Function InitialisePostgres3(Const libpath : shortstring) : integer;
+Function InitialisePostgres3(Const libpath : ansistring) : integer;
 Procedure InitialisePostgres3;
 Procedure InitialisePostgres3;
 Procedure ReleasePostgres3;
 Procedure ReleasePostgres3;
 
 
@@ -247,7 +247,7 @@ begin
 end;
 end;
 
 
 
 
-function InitialisePostgres3(Const libpath : shortstring) : Integer;
+function InitialisePostgres3(Const libpath : ansistring) : Integer;
 
 
 begin
 begin
   inc(RefCount);
   inc(RefCount);