diff --git a/configure.in b/configure.in index 9357505b07..1a80e551f6 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.43 2002-09-11 11:30:43 eku Exp $ +dnl $Id: configure.in,v 1.44 2002-09-17 05:58:33 eku Exp $ dnl ############################# INITIALISATION ############################### @@ -203,6 +203,7 @@ AC_CHECK_TYPE(off64_t, [UNIX_64_BIT_IO=Y AC_DEFINE(UNIX_64_BIT_IO)], [UNIX_64_BIT_IO=N]) +AC_CHECK_SIZEOF(void*) dnl ##################### DO NOT ADD ANY TESTS BELOW ########################### diff --git a/src/burp/canonical.cpp b/src/burp/canonical.cpp index 79f95c3186..8af4989f52 100644 --- a/src/burp/canonical.cpp +++ b/src/burp/canonical.cpp @@ -21,7 +21,7 @@ * Contributor(s): ______________________________________. */ /* -$Id: canonical.cpp,v 1.3 2001-12-24 02:50:48 tamlin Exp $ +$Id: canonical.cpp,v 1.4 2002-09-17 05:58:34 eku Exp $ */ #include "firebird.h" @@ -727,7 +727,7 @@ static bool_t xdr_double(xdrs, ip) temp.temp_short[2] = temp.temp_short[3]; temp.temp_short[3] = t1; #endif -#ifdef VAX +#ifndef WORDS_BIGENDIAN if ((*xdrs->x_ops->x_putlong) (xdrs, &temp.temp_long[1]) && (*xdrs->x_ops->x_putlong) (xdrs, &temp.temp_long[0])) return TRUE; @@ -739,7 +739,7 @@ static bool_t xdr_double(xdrs, ip) return FALSE; case XDR_DECODE: -#ifdef VAX +#ifndef WORDS_BIGENDIAN if (!(*xdrs->x_ops->x_getlong) (xdrs, &temp.temp_long[1]) || !(*xdrs->x_ops->x_getlong) (xdrs, &temp.temp_long[0])) return FALSE; @@ -977,7 +977,7 @@ static bool_t xdr_hyper(register XDR* xdrs, SINT64* pi64) { case XDR_ENCODE: temp.temp_int64 = *pi64; -#ifdef VAX +#ifndef WORDS_BIGENDIAN if ((*xdrs->x_ops->x_putlong) (xdrs, &temp.temp_long[1]) && (*xdrs->x_ops->x_putlong) (xdrs, &temp.temp_long[0])) return TRUE; @@ -989,7 +989,7 @@ static bool_t xdr_hyper(register XDR* xdrs, SINT64* pi64) return FALSE; case XDR_DECODE: -#ifdef VAX +#ifndef WORDS_BIGENDIAN if (!(*xdrs->x_ops->x_getlong) (xdrs, &temp.temp_long[1]) || !(*xdrs->x_ops->x_getlong) (xdrs, &temp.temp_long[0])) return FALSE; diff --git a/src/dsql/dsql.cpp b/src/dsql/dsql.cpp index bd1a01fa00..03b18a5aef 100644 --- a/src/dsql/dsql.cpp +++ b/src/dsql/dsql.cpp @@ -29,7 +29,7 @@ * */ /* -$Id: dsql.cpp,v 1.21 2002-09-01 15:44:45 dimitr Exp $ +$Id: dsql.cpp,v 1.22 2002-09-17 05:58:34 eku Exp $ */ /************************************************************** V4 Multi-threading changes. @@ -2572,7 +2572,7 @@ static USHORT convert( SLONG number, SCHAR * buffer) SLONG n; SCHAR *p; -#ifdef VAX +#ifndef WORDS_BIGENDIAN n = number; p = (SCHAR *) & n; *buffer++ = *p++; diff --git a/src/include/gen/autoconfig_msvc.h b/src/include/gen/autoconfig_msvc.h index 9374a7ed3b..2a3e79c3dd 100644 --- a/src/include/gen/autoconfig_msvc.h +++ b/src/include/gen/autoconfig_msvc.h @@ -1,4 +1,4 @@ -#ident "$Id: autoconfig_msvc.h,v 1.27 2002-09-11 11:30:44 eku Exp $" +#ident "$Id: autoconfig_msvc.h,v 1.28 2002-09-17 05:58:34 eku Exp $" /* * 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete ports: @@ -83,11 +83,14 @@ /* Are we doing 64bit IO on unix */ #undef UNIX_64_BIT_IO +/* sizeof(void *) = 8 ==> HAS_64BIT_POINTERS */ +#define SIZEOF_VOID_P 4 + /* Functions */ #define snprintf _snprintf /* Is the platform big endian? */ -#define WORDS_BIGENDIAN 0 +#undef WORDS_BIGENDIAN /* Return type of signal handler */ #define RETSIGTYPE void diff --git a/src/install/arch-specific/sinixz/prototype.in b/src/install/arch-specific/sinixz/prototype.in index 8406ad0422..48e2cb48c9 100644 --- a/src/install/arch-specific/sinixz/prototype.in +++ b/src/install/arch-specific/sinixz/prototype.in @@ -1,4 +1,4 @@ -# $Header: /home/job/firebird/cvs-backup/firebird2/src/install/arch-specific/sinixz/prototype.in,v 1.1 2002-09-06 08:45:39 eku Exp $ +# $Header: /home/job/firebird/cvs-backup/firebird2/src/install/arch-specific/sinixz/prototype.in,v 1.2 2002-09-17 05:58:35 eku Exp $ #------------------------------------------------------------------------------- !SRCDIR=@NEW_FIREBIRD_DIR@ @@ -18,9 +18,9 @@ d none @prefix@ 0755 root root f none @prefix@/isc4.gdb=$SRCDIR/isc4.gdb 0444 root root f none @prefix@/interbase.msg=$SRCDIR/interbase.msg 0644 root root -f none @prefix@/de_DE.msg=$SRCDIR/de_DE.msg 0644 root root -f none @prefix@/fr_FR.msg=$SRCDIR/fr_FR.msg 0644 root root -f none @prefix@/ja_JP.msg=$SRCDIR/ja_JP.msg 0644 root root +#f none @prefix@/de_DE.msg=$SRCDIR/de_DE.msg 0644 root root +#f none @prefix@/fr_FR.msg=$SRCDIR/fr_FR.msg 0644 root root +#f none @prefix@/ja_JP.msg=$SRCDIR/ja_JP.msg 0644 root root d none @prefix@/bin 0755 root root #f none @prefix@/bin/CSchangeRunUser.sh=$SRCDIR/bin/CSchangeRunUser.sh 0555 root root @@ -39,7 +39,7 @@ f none @prefix@/bin/gds_drop=$SRCDIR/bin/gds_drop 0755 root root #f none @prefix@/bin/gds_relay=$SRCDIR/bin/gds_relay 0755 root root f none @prefix@/bin/gfix=$SRCDIR/bin/gfix 0755 root root f none @prefix@/bin/gpre=$SRCDIR/bin/gpre 0755 root root -f none @prefix@/bin/gpre_boot=$SRCDIR/bin/gpre_boot 0755 root root +#f none @prefix@/bin/gpre_boot=$SRCDIR/bin/gpre_boot 0755 root root #s none @prefix@/bin/gpre_current=gpre_static #f none @prefix@/bin/gpre_static=$SRCDIR/bin/gpre_static 0755 root root f none @prefix@/bin/gsec=$SRCDIR/bin/gsec 0755 root root @@ -67,11 +67,11 @@ f none @prefix@/intl/libfbintl.so=$SRCDIR/intl/libfbintl.so 0755 root root d none @prefix@/lib 0755 root root f none @prefix@/lib/ib_util.so=$SRCDIR/lib/ib_util.so 0755 root root -f none @prefix@/lib/libfbcommon.a=$SRCDIR/lib/libfbcommon.a 0644 root root +#f none @prefix@/lib/libfbcommon.a=$SRCDIR/lib/libfbcommon.a 0644 root root f none @prefix@/lib/libfbembed.so.1.5.0=$SRCDIR/lib/libfbembed.so.1.5.0 0755 root root s none @prefix@/lib/libfbembed.so.1=libfbembed.so.1.5.0 s none @prefix@/lib/libfbembed.so=libfbembed.so.1 -f none @prefix@/lib/libfbstatic.a=$SRCDIR/lib/libfbstatic.a 0644 root root +#f none @prefix@/lib/libfbstatic.a=$SRCDIR/lib/libfbstatic.a 0644 root root d none @prefix@/UDF 0755 root root f none @prefix@/UDF/fb_udf.so=$SRCDIR/UDF/fb_udf.so 0755 root root diff --git a/src/jrd/align.cpp b/src/jrd/align.cpp index e41f4f7aeb..494d761e4c 100644 --- a/src/jrd/align.cpp +++ b/src/jrd/align.cpp @@ -17,7 +17,7 @@ * Contributor(s): ______________________________________. */ /* -$Id: align.cpp,v 1.4 2001-12-29 11:41:22 tamlin Exp $ +$Id: align.cpp,v 1.5 2002-09-17 05:58:35 eku Exp $ */ #include "firebird.h" @@ -120,8 +120,8 @@ static void check_byte_order() order_test.c[0] = 1; order_test.c[1] = 2; - if (order_test.s != 0x0102) - ib_printf("#define VAX\t\t1\n"); + if (order_test.s == 0x0102) + ib_printf("#define WORDS_BIGENDIAN\t\t1\n"); } #ifdef __STDC__ diff --git a/src/jrd/atom.h b/src/jrd/atom.h index b8dffb6161..0d0b7a127d 100644 --- a/src/jrd/atom.h +++ b/src/jrd/atom.h @@ -29,7 +29,7 @@ #define ATOM_LOCKS_PER_LEVEL (1 << 6) /* 64 - must be power of 2 */ #define ATOM_LOCK_LEVELS 2 -#ifdef HAS_64BIT_POINTERS +#if SIZEOF_VOID_P == 8 #define ATOM_SHIFT 3 /* 64 bit */ #define ATOM_MASK (ATOM_LOCKS_PER_LEVEL - 1) #endif diff --git a/src/jrd/bookmark.cpp b/src/jrd/bookmark.cpp index c36748e8ae..4b12ce250c 100644 --- a/src/jrd/bookmark.cpp +++ b/src/jrd/bookmark.cpp @@ -77,7 +77,7 @@ BKM BKM_allocate(RSB rsb, USHORT length) bookmark->bkm_desc.dsc_dtype = dtype_long; bookmark->bkm_desc.dsc_length = sizeof(SLONG); bookmark->bkm_desc.dsc_address = (UCHAR *) & bookmark->bkm_handle; -#if !defined(HAS_64BIT_POINTERS) +#if SIZEOF_VOID_P != 8 bookmark->bkm_handle = (ULONG) bookmark; #else { @@ -130,7 +130,7 @@ BKM BKM_lookup(NOD node) **************************************/ BKM bookmark; -#if !defined(HAS_64BIT_POINTERS) +#if SIZEOF_VOID_P != 8 bookmark = (BKM) MOV_get_long(EVL_expr(tdbb, node), 0); #else { @@ -189,7 +189,7 @@ void BKM_release(NOD node) break; } -#if defined(HAS_64BIT_POINTERS) +#if SIZEOF_VOID_P == 8 slot = MOV_get_long(EVL_expr(tdbb, node), 0); attachment->att_bkm_quick_ref->vec_object[slot] = NULL; #endif diff --git a/src/jrd/btr.cpp b/src/jrd/btr.cpp index dffb091a27..c04baed1f7 100644 --- a/src/jrd/btr.cpp +++ b/src/jrd/btr.cpp @@ -21,7 +21,7 @@ * Contributor(s): ______________________________________. */ /* -$Id: btr.cpp,v 1.4 2002-04-04 07:10:40 bellardo Exp $ +$Id: btr.cpp,v 1.5 2002-09-17 05:58:35 eku Exp $ */ #include "firebird.h" @@ -2137,7 +2137,7 @@ static void compress(TDBB tdbb, #ifdef IEEE -#ifdef VAX +#ifndef WORDS_BIGENDIAN /* For little-endian machines, reverse the order of bytes for the key */ /* Copy the first set of bytes into key_data */ for (q = temp.temp_char + temp_copy_length, length = @@ -2160,7 +2160,7 @@ static void compress(TDBB tdbb, for (q = temp.temp_char + sizeof(double), length = sizeof(SSHORT); length; --length) *p++ = *q++; -#endif /* VAX */ +#endif /* !WORDS_BIGENDIAN */ #else /* IEEE */ diff --git a/src/jrd/common.h b/src/jrd/common.h index dcc17a6625..db22315391 100644 --- a/src/jrd/common.h +++ b/src/jrd/common.h @@ -35,7 +35,7 @@ * 2002.04.16 Paul Beach - HP10 and unistd.h */ /* -$Id: common.h,v 1.27 2002-09-11 19:37:29 skidder Exp $ +$Id: common.h,v 1.28 2002-09-17 05:58:35 eku Exp $ */ #ifndef JRD_COMMON_H @@ -99,7 +99,6 @@ $Id: common.h,v 1.27 2002-09-11 19:37:29 skidder Exp $ #ifdef i386 #define I386 1 -#define VAX 1 #define IMPLEMENTATION isc_info_db_impl_i386 /* 60 next higher unique number, See you later */ #endif /* i386 */ @@ -171,7 +170,6 @@ int shutdown(int s, int how); #ifdef i386 #define I386 1 -#define VAX 1 /* Change version string into SINIXZ */ #define INTL #define IMPLEMENTATION isc_info_db_impl_sinixz /* 64 */ @@ -239,7 +237,6 @@ typedef RETSIGTYPE (*SIG_FPTR) (int); #define UNIX 1 #define IEEE 1 #define I386 1 -#define VAX 1 #define IMPLEMENTATION isc_info_db_impl_freebsd /* 61 */ #define QUADFORMAT "ll" @@ -265,7 +262,6 @@ typedef RETSIGTYPE (*SIG_FPTR) (); #define IEEE 1 #define I386 1 -#define VAX 1 #define IMPLEMENTATION isc_info_db_impl_netbsd /* 62 */ #define QUADFORMAT "ll" @@ -389,7 +385,6 @@ typedef RETSIGTYPE (*SIG_FPTR) (); #ifdef i386 #define I386 1 -#define VAX 1 #define IMPLEMENTATION isc_info_db_impl_isc_sun_386i /* 32 */ #else /* i386 */ #define FB_ALIGN(n,b) ((n+1) & ~1) @@ -455,7 +450,6 @@ typedef RETSIGTYPE (*SIG_FPTR) (); #define INTL #define INTL_BACKEND #define UNIX 1 -#define VAX 1 #define FB_ALIGN(n,b) ((n + b - 1) & ~(b - 1)) #ifdef mips @@ -483,7 +477,6 @@ typedef RETSIGTYPE (*SIG_FPTR) (); #define VA_START(list,parmN) va_start (list, parmN) #define NO_PYXIS #define I386 1 -#define VAX /* Use VAX style byte swapping */ #define NO_NFS #undef LINKS_EXIST #define IEEE /* IEEE floating point arith. */ @@ -527,7 +520,6 @@ typedef RETSIGTYPE (API_ROUTINE * SIG_FPTR) (); /* DEC VAX/VMS and AlphaVMS */ #ifdef VMS -#define VAX 1 #define VAX_FLOAT 1 #define FB_ALIGN(n,b) (n) #define ALIGNMENT 4 @@ -610,7 +602,6 @@ typedef RETSIGTYPE (*SIG_FPTR) (); #define NO_PYXIS #define NOINITGROUPS #define NO_NFS -#define VAX #undef LINKS_EXIST #define MOVE_FAST(from,to,length) memcpy (to, from, (int) (length)) @@ -691,7 +682,6 @@ typedef RETSIGTYPE (CLIB_ROUTINE * SIG_FPTR) (); #endif #define I386 1 -#define VAX 1 #define UNIX 1 #define CURSES_KEYPAD 1 #define NOINITGROUPS @@ -717,7 +707,6 @@ typedef RETSIGTYPE (*SIG_FPTR) (); #define QUADFORMAT "ll" #define QUADCONST(n) (n##LL) #define I386 1 -#define VAX 1 #define UNIX 1 #define SCO_UNIX 1 #define IEEE @@ -756,7 +745,6 @@ typedef RETSIGTYPE (*SIG_FPTR) (); #else #define IMPLEMENTATION isc_info_db_impl_dg_x86 /* 58 */ #define I386 1 -#define VAX 1 #endif /* DG_X86 */ #define IEEE #define INTL @@ -777,9 +765,7 @@ typedef RETSIGTYPE (*SIG_FPTR) (); #define INTL #define NO_PYXIS #define KILLER_SIGNALS -#define HAS_64BIT_POINTERS /* if a machine has 64 bit pointers you need this */ #define UNIX 1 -#define VAX 1 #define FB_ALIGN(n,b) ((n + b - 1) & ~(b - 1)) #define ALIGNMENT 8 #define DOUBLE_ALIGN 8 @@ -853,7 +839,6 @@ typedef unsigned long DWORD; #endif #define I386 1 -#define VAX 1 #define IEEE 1 #define FB_ALIGN(n,b) ((n+1) & ~1) #define OLD_ALIGNMENT @@ -881,7 +866,6 @@ typedef RETSIGTYPE (CLIB_ROUTINE * SIG_FPTR) (); #define KILLER_SIGNALS #define NO_PYXIS #define I386 1 -#define VAX 1 #define UNIX 1 #define CURSES_KEYPAD 1 #define IMPLEMENTATION isc_info_db_impl_unixware, /* 49 */ @@ -1144,7 +1128,7 @@ typedef struct /* data conversion macros */ #ifndef CTO32L -#ifdef VAX +#ifndef WORDS_BIGENDIAN #define CTO32L(p) ((((SCHAR*)(p))[3] << 24) | (((UCHAR*)(p))[2] << 16) | (((UCHAR*)(p))[1] << 8) | (((UCHAR*)(p)) [0])) #else #define CTO32L(p) ((((SCHAR*)(p))[0] << 24) | (((UCHAR*)(p))[1] << 16) | (((UCHAR*)(p))[2] << 8) | (((UCHAR*)(p)) [3])) diff --git a/src/jrd/cvt.cpp b/src/jrd/cvt.cpp index cab012424e..e2fc456fc5 100644 --- a/src/jrd/cvt.cpp +++ b/src/jrd/cvt.cpp @@ -119,7 +119,7 @@ extern double MTH$CVT_D_G(), MTH$CVT_G_D(); #define FLOAT_MAX 3.4e38 /* max float (32 bit) value */ -#ifdef VAX +#ifndef WORDS_BIGENDIAN #define LOW_WORD 0 #define HIGH_WORD 1 #else @@ -181,7 +181,7 @@ static void string_to_datetime(DSC *, GDS_TIMESTAMP *, EXPECT_DATETIME, static double power_of_ten(int); #ifndef NATIVE_QUAD -#ifdef VAX +#ifndef WORDS_BIGENDIAN static CONST SQUAD quad_min_int = { 0, LONG_MIN }; static CONST SQUAD quad_max_int = { -1, LONG_MAX }; #else diff --git a/src/jrd/cvt2.cpp b/src/jrd/cvt2.cpp index d9434f78a7..7282875731 100644 --- a/src/jrd/cvt2.cpp +++ b/src/jrd/cvt2.cpp @@ -52,7 +52,7 @@ extern double MTH$CVT_D_G(), MTH$CVT_G_D(); #endif -#ifdef VAX +#ifndef WORDS_BIGENDIAN #define LOW_WORD 0 #define HIGH_WORD 1 #else diff --git a/src/jrd/evl.cpp b/src/jrd/evl.cpp index 7261547477..6afbbae677 100644 --- a/src/jrd/evl.cpp +++ b/src/jrd/evl.cpp @@ -19,7 +19,7 @@ * * All Rights Reserved. * Contributor(s): ______________________________________. - * $Id: evl.cpp,v 1.13 2002-08-22 08:20:26 dimitr Exp $ + * $Id: evl.cpp,v 1.14 2002-09-17 05:58:35 eku Exp $ */ /* @@ -3782,7 +3782,7 @@ static DSC *lock_record(TDBB tdbb, NOD node, VLU impure) /* return the lock handle (actually the pointer to the lock block) */ -#if !defined(HAS_64BIT_POINTERS) +#if SIZEOF_VOID_P != 8 impure->vlu_misc.vlu_long = (ULONG) lock; #else { @@ -3856,7 +3856,7 @@ static DSC *lock_relation(TDBB tdbb, NOD node, VLU impure) /* return the lock handle (actually the pointer to the lock block) */ -#if !defined(HAS_64BIT_POINTERS) +#if SIZEOF_VOID_P != 8 impure->vlu_misc.vlu_long = (ULONG) lock; #else { diff --git a/src/jrd/exe.cpp b/src/jrd/exe.cpp index a491934bc8..f2b77283c6 100644 --- a/src/jrd/exe.cpp +++ b/src/jrd/exe.cpp @@ -31,7 +31,7 @@ * to count virtual operations, not real I/O on the underlying tables. */ /* -$Id: exe.cpp,v 1.14 2002-09-11 11:30:44 eku Exp $ +$Id: exe.cpp,v 1.15 2002-09-17 05:58:35 eku Exp $ */ #include "firebird.h" @@ -2378,7 +2378,7 @@ static NOD looper(TDBB tdbb, REQ request, NOD in_node) DSC *desc; desc = EVL_expr(tdbb, node->nod_arg[e_rellock_lock]); -#if !defined(HAS_64BIT_POINTERS) +#if SIZEOF_VOID_P != 8 RLCK_release_lock(*(LCK *) desc->dsc_address); #else { diff --git a/src/jrd/ib_stdio.cpp b/src/jrd/ib_stdio.cpp index 13c6fa0c00..6bc40b5b2f 100644 --- a/src/jrd/ib_stdio.cpp +++ b/src/jrd/ib_stdio.cpp @@ -87,7 +87,7 @@ */ /* -$Id: ib_stdio.cpp,v 1.5 2002-07-01 15:07:18 skywalker Exp $ +$Id: ib_stdio.cpp,v 1.6 2002-09-17 05:58:36 eku Exp $ */ #include "firebird.h" @@ -4278,9 +4278,9 @@ extern void *MALLOC(size_t); #ifdef SOLARIS #ifdef sparc #define IEEE_BIG_ENDIAN +#undef WORDS_BIGENDIAN /* EKU: why do we undefine WORDS_BIGENDIAN here ??? */ #else #define IEEE_LITTLE_ENDIAN -#undef VAX #endif #define IEEE_ARITHMETIC #endif @@ -4304,9 +4304,8 @@ extern void *MALLOC(size_t); #define word1(x) ((ULONG *)&x)[1] #endif -#if defined(IEEE_LITTLE_ENDIAN) + defined(IEEE_BIG_ENDIAN) + defined(VAX) + \ - defined(IBM) != 1 -Exactly one of IEEE_LITTLE_ENDIAN IEEE_BIG_ENDIAN, VAX, or IBM should be defined. +#if defined(IEEE_LITTLE_ENDIAN) + defined(IEEE_BIG_ENDIAN) + !defined(WORDS_BIGENDIAN) + defined(IBM) != 1 +Exactly one of IEEE_LITTLE_ENDIAN IEEE_BIG_ENDIAN, WORDS_BIGENDIAN, or IBM should be defined. #endif #if defined(IEEE_LITTLE_ENDIAN) + defined(IEEE_BIG_ENDIAN) #define Exp_shift 20 @@ -4409,7 +4408,7 @@ static const double tens[] = { 1e0, 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9, 1e10, 1e11, 1e12, 1e13, 1e14, 1e15, 1e16, 1e17, 1e18, 1e19, 1e20, 1e21, 1e22 -#ifdef VAX +#ifndef WORDS_BIGENDIAN , 1e23, 1e24 #endif }; @@ -4636,7 +4635,7 @@ static Bigint *d2b(double d, int *e, int *bits) Bigint *b; int de, i, k; ULONG *x, y, z; -#ifdef VAX +#ifndef WORDS_BIGENDIAN ULONG d0, d1; d0 = word0(d) >> 16 | word0(d) << 16; d1 = word1(d) >> 16 | word1(d) << 16; @@ -5193,7 +5192,7 @@ char *ib__dtoa else *sign = 0; -#if defined(IEEE_Arith) + defined(VAX) +#if defined(IEEE_Arith) + !defined(WORDS_BIGENDIAN) #ifdef IEEE_Arith if ((word0(d) & Exp_mask) == Exp_mask) #else diff --git a/src/jrd/inf.cpp b/src/jrd/inf.cpp index 064b6ebb1f..cd68c05f5d 100644 --- a/src/jrd/inf.cpp +++ b/src/jrd/inf.cpp @@ -158,7 +158,7 @@ USHORT DLL_EXPORT INF_convert(SLONG number, SCHAR * buffer) SLONG n; SCHAR *p; -#ifdef VAX +#ifndef WORDS_BIGENDIAN n = number; p = (SCHAR *) & n; *buffer++ = *p++; diff --git a/src/jrd/opt.cpp b/src/jrd/opt.cpp index 8006e1431c..29fec29f71 100644 --- a/src/jrd/opt.cpp +++ b/src/jrd/opt.cpp @@ -27,7 +27,7 @@ * stored procedure doesn't access tables, views or other procedures directly. */ /* -$Id: opt.cpp,v 1.11 2002-09-10 18:33:59 skidder Exp $ +$Id: opt.cpp,v 1.12 2002-09-17 05:58:36 eku Exp $ */ #include "firebird.h" @@ -4085,7 +4085,7 @@ static RSB gen_sort(TDBB tdbb, /* Make key for null flag */ -#ifdef VAX +#ifndef WORDS_BIGENDIAN map_length = ROUNDUP(map_length, sizeof(SLONG)); #endif sort_key->skd_offset = map_item->smb_flag_offset = @@ -4096,7 +4096,7 @@ static RSB gen_sort(TDBB tdbb, sort_key->skd_flags |= SKD_descending; ++sort_key; /* Make key for sort key proper */ -#ifdef VAX +#ifndef WORDS_BIGENDIAN map_length = ROUNDUP(map_length, sizeof(SLONG)); #else if (desc->dsc_dtype >= dtype_aligned) diff --git a/src/jrd/quad.cpp b/src/jrd/quad.cpp index 692929d242..c8e05f38d1 100644 --- a/src/jrd/quad.cpp +++ b/src/jrd/quad.cpp @@ -23,7 +23,7 @@ #include "firebird.h" -#ifdef VAX +#ifndef WORDS_BIGENDIAN #define LOW_WORD 0 #define HIGH_WORD 1 #else diff --git a/src/jrd/sort.cpp b/src/jrd/sort.cpp index a6cadb71bb..c3ff02e864 100644 --- a/src/jrd/sort.cpp +++ b/src/jrd/sort.cpp @@ -19,7 +19,7 @@ * * All Rights Reserved. * Contributor(s): ______________________________________. - * $Id: sort.cpp,v 1.10 2002-07-06 05:31:56 skywalker Exp $ + * $Id: sort.cpp,v 1.11 2002-09-17 05:58:36 eku Exp $ * * 2001-09-24 SJL - Temporary fix for large sort file bug * @@ -203,7 +203,7 @@ IB_FILE *trace_file = NULL; #ifdef SCROLLABLE_CURSORS -#ifndef VAX +#ifdef WORDS_BIGENDIAN void SORT_diddle_key(UCHAR * record, SCB scb, USHORT direction) { /************************************** @@ -1358,7 +1358,7 @@ static UCHAR *sort_alloc(SCB scb, ULONG size) } #ifndef SCROLLABLE_CURSORS -#ifndef VAX +#ifdef WORDS_BIGENDIAN static void diddle_key(UCHAR * record, SCB scb, USHORT direction) { /************************************** diff --git a/src/jrd/vmsthread.cpp b/src/jrd/vmsthread.cpp index ae7ab51b86..176adda0ac 100644 --- a/src/jrd/vmsthread.cpp +++ b/src/jrd/vmsthread.cpp @@ -23,13 +23,6 @@ #include "firebird.h" #include "../jrd/common.h" -#if VMS -#if __ALPHA -#ifdef VAX -#undef VAX -#endif -#endif -#endif #include diff --git a/src/make.new/config/config.h.in b/src/make.new/config/config.h.in index 74ef60eead..b18abc3aa8 100644 --- a/src/make.new/config/config.h.in +++ b/src/make.new/config/config.h.in @@ -1,4 +1,4 @@ -#ident "$Id: config.h.in,v 1.32 2002-09-11 11:30:44 eku Exp $" +#ident "$Id: config.h.in,v 1.33 2002-09-17 05:58:36 eku Exp $" /* * 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete ports: @@ -73,8 +73,11 @@ /* Are we doing 64bit IO on unix */ #undef UNIX_64_BIT_IO +/* sizeof(void *) = 8 ==> HAS_64BIT_POINTERS */ +#define SIZEOF_VOID_P 4 + /* Is the platform big endian? */ -#define WORDS_BIGENDIAN 0 +#undef WORDS_BIGENDIAN /* Return type of signal handler */ #define RETSIGTYPE void diff --git a/src/remote/merge.cpp b/src/remote/merge.cpp index ae03c32367..2892d2115d 100644 --- a/src/remote/merge.cpp +++ b/src/remote/merge.cpp @@ -131,7 +131,7 @@ static SSHORT convert( ULONG number, UCHAR * buffer) ULONG n; UCHAR *p; -#ifdef VAX +#ifndef WORDS_BIGENDIAN n = number; p = (UCHAR *) & n; *buffer++ = *p++; diff --git a/src/remote/protocol.cpp b/src/remote/protocol.cpp index 241dfa5bce..95e6a03af8 100644 --- a/src/remote/protocol.cpp +++ b/src/remote/protocol.cpp @@ -1174,7 +1174,7 @@ static bool_t xdr_hyper( register XDR * xdrs, SINT64 * pi64) switch (xdrs->x_op) { case XDR_ENCODE: temp.temp_int64 = *pi64; -#ifdef VAX +#ifndef WORDS_BIGENDIAN if ((*xdrs->x_ops->x_putlong) (xdrs, &temp.temp_long[1]) && (*xdrs->x_ops->x_putlong) (xdrs, &temp.temp_long[0])) return TRUE; @@ -1186,7 +1186,7 @@ static bool_t xdr_hyper( register XDR * xdrs, SINT64 * pi64) return FALSE; case XDR_DECODE: -#ifdef VAX +#ifndef WORDS_BIGENDIAN if (!(*xdrs->x_ops->x_getlong) (xdrs, &temp.temp_long[1]) || !(*xdrs->x_ops->x_getlong) (xdrs, &temp.temp_long[0])) return FALSE; @@ -1977,7 +1977,7 @@ static bool_t xdr_double( register XDR * xdrs, register double *ip) temp.temp_short[2] = temp.temp_short[3]; temp.temp_short[3] = t1; #endif -#ifdef VAX +#ifndef WORDS_BIGENDIAN if ((*xdrs->x_ops->x_putlong) (xdrs, &temp.temp_long[1]) && (*xdrs->x_ops->x_putlong) (xdrs, &temp.temp_long[0])) return TRUE; @@ -1989,7 +1989,7 @@ static bool_t xdr_double( register XDR * xdrs, register double *ip) return FALSE; case XDR_DECODE: -#ifdef VAX +#ifndef WORDS_BIGENDIAN if (!(*xdrs->x_ops->x_getlong) (xdrs, &temp.temp_long[1]) || !(*xdrs->x_ops->x_getlong) (xdrs, &temp.temp_long[0])) return FALSE; diff --git a/src/utilities/rebuild.cpp b/src/utilities/rebuild.cpp index 72c923f272..9acbafb8e9 100644 --- a/src/utilities/rebuild.cpp +++ b/src/utilities/rebuild.cpp @@ -549,7 +549,7 @@ static USHORT compute_checksum( RBDB rbdb, PAG page) ULONG whole; } sum; -#ifdef VAX +#ifndef WORDS_BIGENDIAN #define LOW_WORD 0 #define HIGH_WORD 1 #else