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

Temporary hack to return Win32 to buildable state. No Win64 port is possible before ULONG name clash is resolved

Browse Source
This commit is contained in:
skidder 2004-01-27 18:19:42 +00:00
parent 178029ca97
commit 0365f32247
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/include/fb_types.h
View File

@ -27,7 +27,7 @@
* Mark O'Donohue <mark.odonohue@ludwig.edu.au> * Mark O'Donohue <mark.odonohue@ludwig.edu.au>
* *
* *
* $Id: fb_types.h,v 1.39 2004-01-26 16:32:54 skidder Exp $ * $Id: fb_types.h,v 1.40 2004-01-27 18:19:42 skidder Exp $
* *
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "OS/2" port * 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "OS/2" port
* *
@ -65,11 +65,15 @@ typedef unsigned long long int ISC_UINT64;
// This comes from limitation that we cannot reliably detect datatype size at // This comes from limitation that we cannot reliably detect datatype size at
// compile time in cases when we do not control compilation (public headers) // compile time in cases when we do not control compilation (public headers)
// We are not going to support 16-bit platforms, right? // We are not going to support 16-bit platforms, right?
//#if SIZEOF_LONG == 8 //
// Temporarly restrict new definition until ULONG clash with Windows
// type is solved. Win64 port is not possible before that point.
// Cannot use SIZEOF_LONG define here because we are in a public header
#if __WORDSIZE == 64
// EKU: Firebird requires (S)LONG to be 32 bit // EKU: Firebird requires (S)LONG to be 32 bit
typedef int SLONG; typedef int SLONG;
typedef unsigned int ULONG; typedef unsigned int ULONG;
/*#else #else
typedef long SLONG; typedef long SLONG;
typedef unsigned long ULONG; typedef unsigned long ULONG;
#endif // SIZEOF_LONG == 8*/ #endif // SIZEOF_LONG == 8*/

9
src/jrd/common.h
View File

@ -49,7 +49,7 @@
* *
*/ */
/* /*
$Id: common.h,v 1.101 2004-01-27 11:06:05 aafemt Exp $ $Id: common.h,v 1.102 2004-01-27 18:19:21 skidder Exp $
*/ */
#ifndef JRD_COMMON_H #ifndef JRD_COMMON_H
@ -792,11 +792,18 @@ typedef struct
#ifndef SLONGFORMAT #ifndef SLONGFORMAT
#if SIZEOF_LONG == 4
#define SLONGFORMAT "ld"
#define ULONGFORMAT "lu"
#define XLONGFORMAT "lX"
#define xLONGFORMAT "lx"
#else
#define SLONGFORMAT "d" #define SLONGFORMAT "d"
#define ULONGFORMAT "u" #define ULONGFORMAT "u"
#define XLONGFORMAT "X" #define XLONGFORMAT "X"
#define xLONGFORMAT "x" #define xLONGFORMAT "x"
#endif #endif
#endif
//format for __LINE__ //format for __LINE__
#ifndef LINEFORMAT #ifndef LINEFORMAT

16
src/jrd/ibase.h
View File

@ -33,7 +33,7 @@
* *
*/ */
/* /*
$Id: ibase.h,v 1.65 2004-01-21 07:18:25 skidder Exp $ $Id: ibase.h,v 1.66 2004-01-27 18:19:22 skidder Exp $
*/ */
#ifndef JRD_IBASE_H #ifndef JRD_IBASE_H
@ -56,13 +56,17 @@ $Id: ibase.h,v 1.65 2004-01-21 07:18:25 skidder Exp $
// It is difficult to detect 64-bit long from the redistributable header // It is difficult to detect 64-bit long from the redistributable header
// we do not care of 16-bit platforms anymore thus we may use plain "int" // we do not care of 16-bit platforms anymore thus we may use plain "int"
// which is 32-bit on all platforms we support // which is 32-bit on all platforms we support
//#if SIZEOF_LONG == 8 //
// Temporarly restrict new definition until ULONG clash with Windows
// type is solved. Win64 port is not possible before that point.
// Cannot use SIZEOF_LONG define here because we are in a public header
#if __WORDSIZE == 64
typedef int ISC_LONG; typedef int ISC_LONG;
typedef unsigned int ISC_ULONG; typedef unsigned int ISC_ULONG;
//#else #else
//typedef signed long ISC_LONG; typedef signed long ISC_LONG;
//typedef unsigned long ISC_ULONG; typedef unsigned long ISC_ULONG;
//#endif #endif
typedef signed short ISC_SHORT; typedef signed short ISC_SHORT;
typedef unsigned short ISC_USHORT; typedef unsigned short ISC_USHORT;