* fixed about a dozen Unix<->linux problems

This commit is contained in:
marco 2003-03-12 21:40:08 +00:00
parent 400baab806
commit 56f299a5a4

View File

@ -1056,7 +1056,7 @@ var odbcversion:word;
{$else} {$else}
{$ifdef linux} {$ifdef unix}
Const Const
LibName = 'odbc'; LibName = 'odbc';
{$else} {$else}
@ -1314,7 +1314,7 @@ type TSQLConfigDataSource=function (
lpszErrorMsg: PCHAR; lpszErrorMsg: PCHAR;
cbErrorMsgMax: SQLUSMALLINT; cbErrorMsgMax: SQLUSMALLINT;
pcbErrorMsg: PSQLUSMALLINT): SQLRETURN;stdcall; pcbErrorMsg: PSQLUSMALLINT): SQLRETURN;stdcall;
{$ifndef linux} {$ifndef unix}
function SQLConfigDataSource( function SQLConfigDataSource(
hwndParent: Integer; hwndParent: Integer;
fRequest: Integer; fRequest: Integer;
@ -1338,7 +1338,7 @@ procedure UnLoadOdbc;
implementation implementation
{$ifndef linux} {$ifndef unix}
uses Windows; uses Windows;
{$endif} {$endif}
@ -1346,7 +1346,7 @@ uses Windows;
{$HPPEMIT '#pragma comment(lib,"odbc32.lib")'} {$HPPEMIT '#pragma comment(lib,"odbc32.lib")'}
{$ENDIF} {$ENDIF}
{$ifndef linux} {$ifndef unix}
Var Var
{$IFDEF DYNLOADINGODBC} {$IFDEF DYNLOADINGODBC}
OdbcHMODULE: HMODULE; OdbcHMODULE: HMODULE;
@ -1532,7 +1532,7 @@ begin
OdbcHMODULE := 0; OdbcHMODULE := 0;
{$endif} {$endif}
{$ifndef linux} {$ifndef unix}
if OdbccpHMODULE <> 0 then if OdbccpHMODULE <> 0 then
begin begin
if not FreeLibrary(OdbccpHMODULE) then if not FreeLibrary(OdbccpHMODULE) then
@ -1551,7 +1551,7 @@ end;
// lpszDriverString: String; // lpszDriverString: String;
// lpszAttributes: String): Integer;stdcall;external 'ODBCCP32.DLL'; // lpszAttributes: String): Integer;stdcall;external 'ODBCCP32.DLL';
{$ifndef linux} {$ifndef unix}
function SQLConfigDataSource( function SQLConfigDataSource(
hwndParent: Integer; hwndParent: Integer;
fRequest: Integer; fRequest: Integer;