mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-19 00:49:09 +02:00
* $linklib is not needed on windows, commented, resolves #19415
git-svn-id: trunk@17663 -
This commit is contained in:
parent
c07ad8dd86
commit
4ad830a140
@ -21,10 +21,10 @@
|
|||||||
|
|
||||||
{$ifndef DYNLOADINGODBC}
|
{$ifndef DYNLOADINGODBC}
|
||||||
{$IFDEF WINDOWS}
|
{$IFDEF WINDOWS}
|
||||||
{$linklib odbc32}
|
{ $linklib odbc32}
|
||||||
{$ELSE}
|
{$ELSE}
|
||||||
{$linklib odbc}
|
{$linklib odbc}
|
||||||
{$endif}
|
{$endif}
|
||||||
{$endif}
|
{$endif}
|
||||||
|
|
||||||
interface
|
interface
|
||||||
@ -130,7 +130,7 @@ const
|
|||||||
{$if ODBCVER >= $0350}
|
{$if ODBCVER >= $0350}
|
||||||
SQL_GUID = -11;
|
SQL_GUID = -11;
|
||||||
{$endif}
|
{$endif}
|
||||||
|
|
||||||
{ interval codes}
|
{ interval codes}
|
||||||
{$ifdef ODBCVER3}
|
{$ifdef ODBCVER3}
|
||||||
SQL_CODE_YEAR = 1;
|
SQL_CODE_YEAR = 1;
|
||||||
@ -175,7 +175,7 @@ const
|
|||||||
SQL_INTERVAL_HOUR_TO_SECOND = -91;
|
SQL_INTERVAL_HOUR_TO_SECOND = -91;
|
||||||
SQL_INTERVAL_MINUTE_TO_SECOND = -92;
|
SQL_INTERVAL_MINUTE_TO_SECOND = -92;
|
||||||
{$endif}
|
{$endif}
|
||||||
|
|
||||||
{ Unicode data type codes }
|
{ Unicode data type codes }
|
||||||
{$ifndef ODBCVER3}
|
{$ifndef ODBCVER3}
|
||||||
SQL_UNICODE = -95;
|
SQL_UNICODE = -95;
|
||||||
@ -240,7 +240,7 @@ const
|
|||||||
SQL_C_USHORT = SQL_C_SHORT+SQL_UNSIGNED_OFFSET; // UNSIGNED SMALLINT
|
SQL_C_USHORT = SQL_C_SHORT+SQL_UNSIGNED_OFFSET; // UNSIGNED SMALLINT
|
||||||
SQL_C_UTINYINT = SQL_TINYINT+SQL_UNSIGNED_OFFSET; // UNSIGNED TINYINT
|
SQL_C_UTINYINT = SQL_TINYINT+SQL_UNSIGNED_OFFSET; // UNSIGNED TINYINT
|
||||||
SQL_C_BOOKMARK = SQL_C_ULONG; // BOOKMARK
|
SQL_C_BOOKMARK = SQL_C_ULONG; // BOOKMARK
|
||||||
|
|
||||||
{$ifdef ODBCVER35}
|
{$ifdef ODBCVER35}
|
||||||
SQL_C_GUID = SQL_GUID;
|
SQL_C_GUID = SQL_GUID;
|
||||||
{$endif}
|
{$endif}
|
||||||
@ -514,7 +514,7 @@ const
|
|||||||
SQL_USE_BOOKMARKS =12;
|
SQL_USE_BOOKMARKS =12;
|
||||||
SQL_GET_BOOKMARK =13; // GetStmtOption Only */
|
SQL_GET_BOOKMARK =13; // GetStmtOption Only */
|
||||||
SQL_ROW_NUMBER = 14; // GetStmtOption Only */
|
SQL_ROW_NUMBER = 14; // GetStmtOption Only */
|
||||||
|
|
||||||
SQL_ATTR_CURSOR_TYPE = SQL_CURSOR_TYPE;
|
SQL_ATTR_CURSOR_TYPE = SQL_CURSOR_TYPE;
|
||||||
SQL_ATTR_CONCURRENCY = SQL_CONCURRENCY;
|
SQL_ATTR_CONCURRENCY = SQL_CONCURRENCY;
|
||||||
SQL_ATTR_FETCH_BOOKMARK_PTR = 16;
|
SQL_ATTR_FETCH_BOOKMARK_PTR = 16;
|
||||||
@ -1055,7 +1055,7 @@ type TSQLGetDiagRec=function (HandleType:SQLSMALLINT;
|
|||||||
Sqlstate:PSQLCHAR;var NativeError:SQLINTEGER;
|
Sqlstate:PSQLCHAR;var NativeError:SQLINTEGER;
|
||||||
MessageText:PSQLCHAR;BufferLength:SQLSMALLINT;
|
MessageText:PSQLCHAR;BufferLength:SQLSMALLINT;
|
||||||
var TextLength:SQLSMALLINT ):SQLRETURN;{$ifdef fpc} extdecl {$else} stdcall {$endif};
|
var TextLength:SQLSMALLINT ):SQLRETURN;{$ifdef fpc} extdecl {$else} stdcall {$endif};
|
||||||
|
|
||||||
type TSQLGetDiagField=function (HandleType:SQLSMALLINT;
|
type TSQLGetDiagField=function (HandleType:SQLSMALLINT;
|
||||||
Handle:SQLHANDLE;RecNumber:SQLSMALLINT;
|
Handle:SQLHANDLE;RecNumber:SQLSMALLINT;
|
||||||
DiagIdentifier:SQLSMALLINT;DiagInfoPtr:SQLPOINTER;
|
DiagIdentifier:SQLSMALLINT;DiagInfoPtr:SQLPOINTER;
|
||||||
@ -1548,7 +1548,7 @@ begin
|
|||||||
inc(RefCount);
|
inc(RefCount);
|
||||||
if RefCount = 1 then
|
if RefCount = 1 then
|
||||||
begin
|
begin
|
||||||
if OverrideName='' then
|
if OverrideName='' then
|
||||||
libname:=odbclib
|
libname:=odbclib
|
||||||
else
|
else
|
||||||
libname:=OverrideName;
|
libname:=OverrideName;
|
||||||
|
Loading…
Reference in New Issue
Block a user