diff options
| author | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2012-03-24 09:31:05 +0000 |
|---|---|---|
| committer | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2012-03-24 09:31:05 +0000 |
| commit | 6334333492234542ac6b466e97ecd251e4274d29 (patch) | |
| tree | 92da89236c35b3acb87f5d6a06f50b6bed2c59eb /packages/ibase | |
| parent | 9d637f17db1555a0e0d23bc6d50394b57a0ff2dd (diff) | |
| download | fpc-6334333492234542ac6b466e97ecd251e4274d29.tar.gz | |
* ISC_STATUS to ptrint and all handles to 32-bit. Mantis #19116 related (but
not fixing that?)
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@20610 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/ibase')
| -rw-r--r-- | packages/ibase/src/ibase60.inc | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/packages/ibase/src/ibase60.inc b/packages/ibase/src/ibase60.inc index 930b3fc117..c1f85d8aee 100644 --- a/packages/ibase/src/ibase60.inc +++ b/packages/ibase/src/ibase60.inc @@ -68,7 +68,9 @@ type Type ISC_USHORT = word; - ISC_STATUS = clong; + ISC_STATUS = ptrint; { CLong according the sources but they ifdef + for win64, the only significant platform + where clong<>ptrint} ISC_INT64 = int64; ISC_UINT64 = qword; ISC_LONG = Longint; @@ -80,6 +82,13 @@ Type PISC_UINT64 = ^ISC_UINT64; PISC_LONG = ^ISC_LONG; + {$IFDEF CPU64} + FB_API_HANDLE = cuint; + {$ELSE} + FB_API_HANDLE = pointer; + {$ENDIF} + + const DSQL_close = 1; DSQL_drop = 2; @@ -327,15 +336,16 @@ type { } type - isc_att_handle = pointer; - isc_blob_handle = pointer; - isc_db_handle = pointer; - isc_form_handle = pointer; - isc_req_handle = pointer; - isc_stmt_handle = pointer; - isc_svc_handle = pointer; - isc_tr_handle = pointer; - isc_win_handle = pointer; + + isc_att_handle = FB_API_HANDLE; + isc_blob_handle = FB_API_HANDLE; + isc_db_handle = FB_API_HANDLE; + isc_form_handle = FB_API_HANDLE; // can't find in 2.5.1 + isc_req_handle = FB_API_HANDLE; + isc_stmt_handle = FB_API_HANDLE; + isc_svc_handle = FB_API_HANDLE; + isc_tr_handle = FB_API_HANDLE; + isc_win_handle = pointer; // can't find in 2.5.1 isc_callback = procedure ;extdecl; isc_resv_handle = ISC_LONG; tisc_att_handle = isc_att_handle; |