firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 20:03:03 +01:00
Code Issues

Join two compiler dependent defines. Put in fb_types.h since it is always included in ibase.h

Browse Source
This commit is contained in:
brodsom 2003-02-27 21:09:51 +00:00
parent dde73f1b8e
commit 33a232d7b6
2 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/include/fb_types.h
View File

@ -27,7 +27,7 @@
* Mark O'Donohue <mark.odonohue@ludwig.edu.au>
*
*
* $Id: fb_types.h,v 1.15 2003-02-27 04:36:03 brodsom Exp $
* $Id: fb_types.h,v 1.16 2003-02-27 21:09:51 brodsom Exp $
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "OS/2" port
*
@ -38,10 +38,35 @@
#define INCLUDE_FB_TYPES_H
/******************************************************************/
/* Define type, export and other stuff based on c/c++ and Windows */
/******************************************************************/
#define ISC_FAR
#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
# define GDS_EXPORT __stdcall
#define ISC_FAR
#ifndef __GNUC__
typedef __int64 ISC_INT64;
typedef unsigned __int64 ISC_UINT64;
#define ISC_INT64_DEFINED
#endif
#define GDS_EXPORT __stdcall
#define GDS_EXPORT_VARARG __cdecl
#else
# define GDS_EXPORT
#define GDS_EXPORT
#define GDS_EXPORT_VARARG
#endif
/*******************************************************************/
/* 64 bit Integers */
/*******************************************************************/
#ifdef ISC_INT64_DEFINED
#undef ISC_INT64_DEFINED
#else
typedef long long int ISC_INT64;
typedef unsigned long long int ISC_UINT64;
#endif
#if SIZEOF_LONG == 8

31
src/jrd/ibase.h
View File

@ -33,7 +33,7 @@
*
*/
/*
$Id: ibase.h,v 1.30 2003-02-27 20:06:44 brodsom Exp $
$Id: ibase.h,v 1.31 2003-02-27 21:09:37 brodsom Exp $
*/
#ifndef JRD_IBASE_H
@ -70,24 +70,6 @@ $Id: ibase.h,v 1.30 2003-02-27 20:06:44 brodsom Exp $
#define DSQL_drop 2
/******************************************************************/
/* Define type, export and other stuff based on c/c++ and Windows */
/******************************************************************/
#define ISC_FAR
#if (defined(WIN32) || defined(_WIN32) || defined(__WIN32__))
#define ISC_FAR
#define GDS_EXPORT_VARARG __cdecl
#ifndef __GNUC__
typedef __int64 ISC_INT64;
typedef unsigned __int64 ISC_UINT64;
#define ISC_INT64_DEFINED
#endif
#else /* Not Windows */
#define GDS_EXPORT_VARARG
#endif /* Windows/NT */
/********************************/
/* InterBase Handle Definitions */
/********************************/
@ -106,17 +88,6 @@ typedef FRBRD ISC_FAR* isc_tr_handle;
typedef void (ISC_FAR* isc_callback) ();
typedef ISC_LONG isc_resv_handle;
/*******************************************************************/
/* 64 bit Integers */
/*******************************************************************/
#ifdef ISC_INT64_DEFINED
#undef ISC_INT64_DEFINED
#else
typedef long long int ISC_INT64;
typedef unsigned long long int ISC_UINT64;
#endif
/*******************************************************************/
/* Time & Date Support */
/*******************************************************************/