From 39e296192c0b095fd7708216290d7a0d972eb3b4 Mon Sep 17 00:00:00 2001 From: eku Date: Mon, 2 Dec 2002 08:25:23 +0000 Subject: [PATCH] Removed inconsistencies pointed out by Claudio Valderr. Replaced 'defined(__osf__) && defined(__alpha)' with 'SIZEOF_LONG == 8'. New macro FB_NELEM calculates the number of elements in an array. --- configure.in | 3 +- src/common/config/config.cpp | 6 +- src/dudley/hsh.cpp | 6 +- src/gpre/hsh.cpp | 10 +- src/include/fb_types.h | 25 +- src/include/gen/autoconfig_msvc.h | 1 + src/include/gen/codes.h | 1440 ++++++++++++++--------------- src/jrd/align.cpp | 6 +- src/jrd/codes.epp | 44 +- src/jrd/gdsold.h | 196 ++-- src/jrd/ibase.h | 4 +- src/jrd/intl.cpp | 2 - src/jrd/sym.cpp | 2 - src/lock/lock.cpp | 4 +- src/make.new/config/config.h.in | 3 +- src/qli/hsh.cpp | 6 +- src/utilities/create_db.cpp | 4 +- 17 files changed, 870 insertions(+), 892 deletions(-) diff --git a/configure.in b/configure.in index c363d8e971..a8ff5311d8 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.98 2002-11-30 15:08:00 skidder Exp $ +dnl $Id: configure.in,v 1.99 2002-12-02 08:25:14 eku Exp $ dnl ############################# INITIALISATION ############################### @@ -344,6 +344,7 @@ AC_TYPE_SIGNAL AC_CHECK_TYPE(socklen_t,int) AC_SYS_LARGEFILE AC_CHECK_SIZEOF(void*) +AC_CHECK_SIZEOF(long) AC_CHECK_TYPE(semun) AC_CHECK_TYPES([struct XDR::xdr_ops],,,[#include #include ]) diff --git a/src/common/config/config.cpp b/src/common/config/config.cpp index efe8472c15..34a24a67c4 100644 --- a/src/common/config/config.cpp +++ b/src/common/config/config.cpp @@ -76,7 +76,7 @@ ConfigImpl::ConfigImpl() ConfigFile file; root_dir = getRootDirectory().c_str(); MemoryPool *pool = getDefaultMemoryPool(); - int size = sizeof(entries) / sizeof(entries[0]); + int size = FB_NELEM(entries); values = FB_NEW(*pool) ConfigValue[size]; string val_sep = ","; @@ -123,9 +123,11 @@ ConfigImpl::ConfigImpl() ConfigImpl::~ConfigImpl() { + int size = FB_NELEM(entries); + /* Free allocated memory */ - for (int i = 0; i < sizeof(entries) / sizeof(entries[0]); i++) + for (int i = 0; i < size; i++) { if (values[i] == entries[i].default_value) continue; diff --git a/src/dudley/hsh.cpp b/src/dudley/hsh.cpp index 0f975b19ea..ebe73e5116 100644 --- a/src/dudley/hsh.cpp +++ b/src/dudley/hsh.cpp @@ -262,8 +262,6 @@ struct word { {KW_WITH, "WITH"} }; -#define NUMWORDS (sizeof (keywords) / sizeof (struct word)) - void HSH_init(void) { @@ -280,10 +278,10 @@ void HSH_init(void) **************************************/ register SCHAR *string; register SYM symbol; - register USHORT i; + register int i; register SSHORT length; - for (i = 0; i < (USHORT)NUMWORDS; i++) { + for (i = 0; i < FB_NELEM(keywords); i++) { string = keywords[i].keyword; for (length = 0; string[length] != '\0'; length++); symbol = (SYM) DDL_alloc(SYM_LEN); diff --git a/src/gpre/hsh.cpp b/src/gpre/hsh.cpp index d451d504cf..28e22741a9 100644 --- a/src/gpre/hsh.cpp +++ b/src/gpre/hsh.cpp @@ -25,7 +25,7 @@ // //____________________________________________________________ // -// $Id: hsh.cpp,v 1.7 2002-11-17 00:04:18 hippoman Exp $ +// $Id: hsh.cpp,v 1.8 2002-12-02 08:25:16 eku Exp $ // #include "firebird.h" @@ -58,10 +58,6 @@ static struct word { #include "../gpre/hsh.h" }; -#define NUMWORDS (sizeof (keywords) / sizeof (struct word)) - - - //____________________________________________________________ // @@ -91,14 +87,14 @@ void HSH_init(void) { register SCHAR *string; register SYM symbol, *ptr; - SSHORT i; + register int i; register struct word *word; for (ptr = hash_table, i = 0; i < HASH_SIZE; i++) *ptr++ = NULL; fflush(stdout); - for (i = 0, word = keywords; i < (SSHORT)NUMWORDS; i++, word++) { + for (i = 0, word = keywords; i < FB_NELEM(keywords); i++, word++) { for (string = word->keyword; *string; string++); symbol = (SYM) ALLOC(SYM_LEN); symbol->sym_type = SYM_keyword; diff --git a/src/include/fb_types.h b/src/include/fb_types.h index 793f50a225..b271a4e6e1 100644 --- a/src/include/fb_types.h +++ b/src/include/fb_types.h @@ -27,7 +27,7 @@ * Mark O'Donohue * * - * $Id: fb_types.h,v 1.9 2002-11-22 14:09:36 dimitr Exp $ + * $Id: fb_types.h,v 1.10 2002-12-02 08:25:16 eku Exp $ * * 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "OS/2" port * @@ -54,8 +54,8 @@ #endif -#if (defined(__osf__) && defined(__alpha)) -/* It appears the alpha has a 32 bit int and a 64 bit long. */ +#if SIZEOF_LONG == 8 + /* EKU: Firebird requires (S)LONG to be 32 bit */ # define LONG_DEFINED typedef int SLONG; typedef unsigned int ULONG; @@ -64,8 +64,7 @@ typedef long SQUAD; typedef unsigned long UQUAD; # define NATIVE_QUAD - -#endif /* DEC osf */ +#endif /* SIZEOF_LONG == 8 */ @@ -152,19 +151,7 @@ typedef ULONG RCRD_OFFSET; typedef USHORT FLD_LENGTH; -#define GDS_TRUE 1 -#define GDS_FALSE 0 - -#if !(defined __cplusplus) -#define GDS__TRUE GDS_TRUE -#define GDS__FALSE GDS_FALSE -#endif - -/* We can remove these three #defines if we change gdsold.h and gen/codes.h */ -#define GDS_LONG SLONG -#define GDS_ULONG ULONG - -#define GDS_STATUS long +/* Number of elements in an arry */ +#define FB_NELEM(x) ((int)(sizeof(x) / sizeof(x[0]))) #endif /* INCLUDE_FB_TYPES_H */ - diff --git a/src/include/gen/autoconfig_msvc.h b/src/include/gen/autoconfig_msvc.h index 1d870b04a5..19191d8c70 100644 --- a/src/include/gen/autoconfig_msvc.h +++ b/src/include/gen/autoconfig_msvc.h @@ -126,6 +126,7 @@ /* sizeof(void *) = 8 ==> HAS_64BIT_POINTERS */ #define SIZEOF_VOID_P 4 +#define SIZEOF_LONG 4 /* Is union semun defined? */ #undef HAVE_SEMUN diff --git a/src/include/gen/codes.h b/src/include/gen/codes.h index 0d06a34a3d..70ae599cd9 100644 --- a/src/include/gen/codes.h +++ b/src/include/gen/codes.h @@ -23,727 +23,727 @@ #ifdef __cplusplus /* c++ definitions */ -const GDS_LONG gds_facility = 20; -const GDS_LONG gds_err_base = 335544320L; -const GDS_LONG gds_err_factor = 1; -const GDS_LONG gds_arg_end = 0; /* end of argument list */ -const GDS_LONG gds_arg_gds = 1; /* generic DSRI status value */ -const GDS_LONG gds_arg_string = 2; /* string argument */ -const GDS_LONG gds_arg_cstring = 3; /* count & string argument */ -const GDS_LONG gds_arg_number = 4; /* numeric argument (long) */ -const GDS_LONG gds_arg_interpreted = 5; /* interpreted status code (string) */ -const GDS_LONG gds_arg_vms = 6; /* VAX/VMS status code (long) */ -const GDS_LONG gds_arg_unix = 7; /* UNIX error code */ -const GDS_LONG gds_arg_domain = 8; /* Apollo/Domain error code */ -const GDS_LONG gds_arg_dos = 9; /* MSDOS/OS2 error code */ -const GDS_LONG gds_arg_mpexl = 10; /* HP MPE/XL error code */ -const GDS_LONG gds_arg_mpexl_ipc = 11; /* HP MPE/XL IPC error code */ -const GDS_LONG gds_arg_next_mach = 15; /* NeXT/Mach error code */ -const GDS_LONG gds_arg_netware = 16; /* NetWare error code */ -const GDS_LONG gds_arg_win32 = 17; /* Win32 error code */ -const GDS_LONG gds_arg_warning = 18; /* warning argument */ +const SLONG gds_facility = 20; +const SLONG gds_err_base = 335544320L; +const SLONG gds_err_factor = 1; +const SLONG gds_arg_end = 0; /* end of argument list */ +const SLONG gds_arg_gds = 1; /* generic DSRI status value */ +const SLONG gds_arg_string = 2; /* string argument */ +const SLONG gds_arg_cstring = 3; /* count & string argument */ +const SLONG gds_arg_number = 4; /* numeric argument (long) */ +const SLONG gds_arg_interpreted = 5; /* interpreted status code (string) */ +const SLONG gds_arg_vms = 6; /* VAX/VMS status code (long) */ +const SLONG gds_arg_unix = 7; /* UNIX error code */ +const SLONG gds_arg_domain = 8; /* Apollo/Domain error code */ +const SLONG gds_arg_dos = 9; /* MSDOS/OS2 error code */ +const SLONG gds_arg_mpexl = 10; /* HP MPE/XL error code */ +const SLONG gds_arg_mpexl_ipc = 11; /* HP MPE/XL IPC error code */ +const SLONG gds_arg_next_mach = 15; /* NeXT/Mach error code */ +const SLONG gds_arg_netware = 16; /* NetWare error code */ +const SLONG gds_arg_win32 = 17; /* Win32 error code */ +const SLONG gds_arg_warning = 18; /* warning argument */ -const GDS_LONG gds_arith_except = 335544321L; -const GDS_LONG gds_bad_dbkey = 335544322L; -const GDS_LONG gds_bad_db_format = 335544323L; -const GDS_LONG gds_bad_db_handle = 335544324L; -const GDS_LONG gds_bad_dpb_content = 335544325L; -const GDS_LONG gds_bad_dpb_form = 335544326L; -const GDS_LONG gds_bad_req_handle = 335544327L; -const GDS_LONG gds_bad_segstr_handle = 335544328L; -const GDS_LONG gds_bad_segstr_id = 335544329L; -const GDS_LONG gds_bad_tpb_content = 335544330L; -const GDS_LONG gds_bad_tpb_form = 335544331L; -const GDS_LONG gds_bad_trans_handle = 335544332L; -const GDS_LONG gds_bug_check = 335544333L; -const GDS_LONG gds_convert_error = 335544334L; -const GDS_LONG gds_db_corrupt = 335544335L; -const GDS_LONG gds_deadlock = 335544336L; -const GDS_LONG gds_excess_trans = 335544337L; -const GDS_LONG gds_from_no_match = 335544338L; -const GDS_LONG gds_infinap = 335544339L; -const GDS_LONG gds_infona = 335544340L; -const GDS_LONG gds_infunk = 335544341L; -const GDS_LONG gds_integ_fail = 335544342L; -const GDS_LONG gds_invalid_blr = 335544343L; -const GDS_LONG gds_io_error = 335544344L; -const GDS_LONG gds_lock_conflict = 335544345L; -const GDS_LONG gds_metadata_corrupt = 335544346L; -const GDS_LONG gds_not_valid = 335544347L; -const GDS_LONG gds_no_cur_rec = 335544348L; -const GDS_LONG gds_no_dup = 335544349L; -const GDS_LONG gds_no_finish = 335544350L; -const GDS_LONG gds_no_meta_update = 335544351L; -const GDS_LONG gds_no_priv = 335544352L; -const GDS_LONG gds_no_recon = 335544353L; -const GDS_LONG gds_no_record = 335544354L; -const GDS_LONG gds_no_segstr_close = 335544355L; -const GDS_LONG gds_obsolete_metadata = 335544356L; -const GDS_LONG gds_open_trans = 335544357L; -const GDS_LONG gds_port_len = 335544358L; -const GDS_LONG gds_read_only_field = 335544359L; -const GDS_LONG gds_read_only_rel = 335544360L; -const GDS_LONG gds_read_only_trans = 335544361L; -const GDS_LONG gds_read_only_view = 335544362L; -const GDS_LONG gds_req_no_trans = 335544363L; -const GDS_LONG gds_req_sync = 335544364L; -const GDS_LONG gds_req_wrong_db = 335544365L; -const GDS_LONG gds_segment = 335544366L; -const GDS_LONG gds_segstr_eof = 335544367L; -const GDS_LONG gds_segstr_no_op = 335544368L; -const GDS_LONG gds_segstr_no_read = 335544369L; -const GDS_LONG gds_segstr_no_trans = 335544370L; -const GDS_LONG gds_segstr_no_write = 335544371L; -const GDS_LONG gds_segstr_wrong_db = 335544372L; -const GDS_LONG gds_sys_request = 335544373L; -const GDS_LONG gds_stream_eof = 335544374L; -const GDS_LONG gds_unavailable = 335544375L; -const GDS_LONG gds_unres_rel = 335544376L; -const GDS_LONG gds_uns_ext = 335544377L; -const GDS_LONG gds_wish_list = 335544378L; -const GDS_LONG gds_wrong_ods = 335544379L; -const GDS_LONG gds_wronumarg = 335544380L; -const GDS_LONG gds_imp_exc = 335544381L; -const GDS_LONG gds_random = 335544382L; -const GDS_LONG gds_fatal_conflict = 335544383L; -const GDS_LONG gds_badblk = 335544384L; -const GDS_LONG gds_invpoolcl = 335544385L; -const GDS_LONG gds_nopoolids = 335544386L; -const GDS_LONG gds_relbadblk = 335544387L; -const GDS_LONG gds_blktoobig = 335544388L; -const GDS_LONG gds_bufexh = 335544389L; -const GDS_LONG gds_syntaxerr = 335544390L; -const GDS_LONG gds_bufinuse = 335544391L; -const GDS_LONG gds_bdbincon = 335544392L; -const GDS_LONG gds_reqinuse = 335544393L; -const GDS_LONG gds_badodsver = 335544394L; -const GDS_LONG gds_relnotdef = 335544395L; -const GDS_LONG gds_fldnotdef = 335544396L; -const GDS_LONG gds_dirtypage = 335544397L; -const GDS_LONG gds_waifortra = 335544398L; -const GDS_LONG gds_doubleloc = 335544399L; -const GDS_LONG gds_nodnotfnd = 335544400L; -const GDS_LONG gds_dupnodfnd = 335544401L; -const GDS_LONG gds_locnotmar = 335544402L; -const GDS_LONG gds_badpagtyp = 335544403L; -const GDS_LONG gds_corrupt = 335544404L; -const GDS_LONG gds_badpage = 335544405L; -const GDS_LONG gds_badindex = 335544406L; -const GDS_LONG gds_dbbnotzer = 335544407L; -const GDS_LONG gds_tranotzer = 335544408L; -const GDS_LONG gds_trareqmis = 335544409L; -const GDS_LONG gds_badhndcnt = 335544410L; -const GDS_LONG gds_wrotpbver = 335544411L; -const GDS_LONG gds_wroblrver = 335544412L; -const GDS_LONG gds_wrodpbver = 335544413L; -const GDS_LONG gds_blobnotsup = 335544414L; -const GDS_LONG gds_badrelation = 335544415L; -const GDS_LONG gds_nodetach = 335544416L; -const GDS_LONG gds_notremote = 335544417L; -const GDS_LONG gds_trainlim = 335544418L; -const GDS_LONG gds_notinlim = 335544419L; -const GDS_LONG gds_traoutsta = 335544420L; -const GDS_LONG gds_connect_reject = 335544421L; -const GDS_LONG gds_dbfile = 335544422L; -const GDS_LONG gds_orphan = 335544423L; -const GDS_LONG gds_no_lock_mgr = 335544424L; -const GDS_LONG gds_ctxinuse = 335544425L; -const GDS_LONG gds_ctxnotdef = 335544426L; -const GDS_LONG gds_datnotsup = 335544427L; -const GDS_LONG gds_badmsgnum = 335544428L; -const GDS_LONG gds_badparnum = 335544429L; -const GDS_LONG gds_virmemexh = 335544430L; -const GDS_LONG gds_blocking_signal = 335544431L; -const GDS_LONG gds_lockmanerr = 335544432L; -const GDS_LONG gds_journerr = 335544433L; -const GDS_LONG gds_keytoobig = 335544434L; -const GDS_LONG gds_nullsegkey = 335544435L; -const GDS_LONG gds_sqlerr = 335544436L; -const GDS_LONG gds_wrodynver = 335544437L; -const GDS_LONG gds_funnotdef = 335544438L; -const GDS_LONG gds_funmismat = 335544439L; -const GDS_LONG gds_bad_msg_vec = 335544440L; -const GDS_LONG gds_bad_detach = 335544441L; -const GDS_LONG gds_noargacc_read = 335544442L; -const GDS_LONG gds_noargacc_write = 335544443L; -const GDS_LONG gds_read_only = 335544444L; -const GDS_LONG gds_ext_err = 335544445L; -const GDS_LONG gds_non_updatable = 335544446L; -const GDS_LONG gds_no_rollback = 335544447L; -const GDS_LONG gds_bad_sec_info = 335544448L; -const GDS_LONG gds_invalid_sec_info = 335544449L; -const GDS_LONG gds_misc_interpreted = 335544450L; -const GDS_LONG gds_update_conflict = 335544451L; -const GDS_LONG gds_unlicensed = 335544452L; -const GDS_LONG gds_obj_in_use = 335544453L; -const GDS_LONG gds_nofilter = 335544454L; -const GDS_LONG gds_shadow_accessed = 335544455L; -const GDS_LONG gds_invalid_sdl = 335544456L; -const GDS_LONG gds_out_of_bounds = 335544457L; -const GDS_LONG gds_invalid_dimension = 335544458L; -const GDS_LONG gds_rec_in_limbo = 335544459L; -const GDS_LONG gds_shadow_missing = 335544460L; -const GDS_LONG gds_cant_validate = 335544461L; -const GDS_LONG gds_cant_start_journal = 335544462L; -const GDS_LONG gds_gennotdef = 335544463L; -const GDS_LONG gds_cant_start_logging = 335544464L; -const GDS_LONG gds_bad_segstr_type = 335544465L; -const GDS_LONG gds_foreign_key = 335544466L; -const GDS_LONG gds_high_minor = 335544467L; -const GDS_LONG gds_tra_state = 335544468L; -const GDS_LONG gds_trans_invalid = 335544469L; -const GDS_LONG gds_buf_invalid = 335544470L; -const GDS_LONG gds_indexnotdefined = 335544471L; -const GDS_LONG gds_login = 335544472L; -const GDS_LONG gds_invalid_bookmark = 335544473L; -const GDS_LONG gds_bad_lock_level = 335544474L; -const GDS_LONG gds_relation_lock = 335544475L; -const GDS_LONG gds_record_lock = 335544476L; -const GDS_LONG gds_max_idx = 335544477L; -const GDS_LONG gds_jrn_enable = 335544478L; -const GDS_LONG gds_old_failure = 335544479L; -const GDS_LONG gds_old_in_progress = 335544480L; -const GDS_LONG gds_old_no_space = 335544481L; -const GDS_LONG gds_no_wal_no_jrn = 335544482L; -const GDS_LONG gds_num_old_files = 335544483L; -const GDS_LONG gds_wal_file_open = 335544484L; -const GDS_LONG gds_bad_stmt_handle = 335544485L; -const GDS_LONG gds_wal_failure = 335544486L; -const GDS_LONG gds_walw_err = 335544487L; -const GDS_LONG gds_logh_small = 335544488L; -const GDS_LONG gds_logh_inv_version = 335544489L; -const GDS_LONG gds_logh_open_flag = 335544490L; -const GDS_LONG gds_logh_open_flag2 = 335544491L; -const GDS_LONG gds_logh_diff_dbname = 335544492L; -const GDS_LONG gds_logf_unexpected_eof = 335544493L; -const GDS_LONG gds_logr_incomplete = 335544494L; -const GDS_LONG gds_logr_header_small = 335544495L; -const GDS_LONG gds_logb_small = 335544496L; -const GDS_LONG gds_wal_illegal_attach = 335544497L; -const GDS_LONG gds_wal_invalid_wpb = 335544498L; -const GDS_LONG gds_wal_err_rollover = 335544499L; -const GDS_LONG gds_no_wal = 335544500L; -const GDS_LONG gds_drop_wal = 335544501L; -const GDS_LONG gds_stream_not_defined = 335544502L; -const GDS_LONG gds_wal_subsys_error = 335544503L; -const GDS_LONG gds_wal_subsys_corrupt = 335544504L; -const GDS_LONG gds_no_archive = 335544505L; -const GDS_LONG gds_shutinprog = 335544506L; -const GDS_LONG gds_range_in_use = 335544507L; -const GDS_LONG gds_range_not_found = 335544508L; -const GDS_LONG gds_charset_not_found = 335544509L; -const GDS_LONG gds_lock_timeout = 335544510L; -const GDS_LONG gds_prcnotdef = 335544511L; -const GDS_LONG gds_prcmismat = 335544512L; -const GDS_LONG gds_wal_bugcheck = 335544513L; -const GDS_LONG gds_wal_cant_expand = 335544514L; -const GDS_LONG gds_codnotdef = 335544515L; -const GDS_LONG gds_xcpnotdef = 335544516L; -const GDS_LONG gds_except = 335544517L; -const GDS_LONG gds_cache_restart = 335544518L; -const GDS_LONG gds_bad_lock_handle = 335544519L; -const GDS_LONG gds_jrn_present = 335544520L; -const GDS_LONG gds_wal_err_rollover2 = 335544521L; -const GDS_LONG gds_wal_err_logwrite = 335544522L; -const GDS_LONG gds_wal_err_jrn_comm = 335544523L; -const GDS_LONG gds_wal_err_expansion = 335544524L; -const GDS_LONG gds_wal_err_setup = 335544525L; -const GDS_LONG gds_wal_err_ww_sync = 335544526L; -const GDS_LONG gds_wal_err_ww_start = 335544527L; -const GDS_LONG gds_shutdown = 335544528L; -const GDS_LONG gds_existing_priv_mod = 335544529L; -const GDS_LONG gds_primary_key_ref = 335544530L; -const GDS_LONG gds_primary_key_notnull = 335544531L; -const GDS_LONG gds_ref_cnstrnt_notfound = 335544532L; -const GDS_LONG gds_foreign_key_notfound = 335544533L; -const GDS_LONG gds_ref_cnstrnt_update = 335544534L; -const GDS_LONG gds_check_cnstrnt_update = 335544535L; -const GDS_LONG gds_check_cnstrnt_del = 335544536L; -const GDS_LONG gds_integ_index_seg_del = 335544537L; -const GDS_LONG gds_integ_index_seg_mod = 335544538L; -const GDS_LONG gds_integ_index_del = 335544539L; -const GDS_LONG gds_integ_index_mod = 335544540L; -const GDS_LONG gds_check_trig_del = 335544541L; -const GDS_LONG gds_check_trig_update = 335544542L; -const GDS_LONG gds_cnstrnt_fld_del = 335544543L; -const GDS_LONG gds_cnstrnt_fld_rename = 335544544L; -const GDS_LONG gds_rel_cnstrnt_update = 335544545L; -const GDS_LONG gds_constaint_on_view = 335544546L; -const GDS_LONG gds_invld_cnstrnt_type = 335544547L; -const GDS_LONG gds_primary_key_exists = 335544548L; -const GDS_LONG gds_systrig_update = 335544549L; -const GDS_LONG gds_not_rel_owner = 335544550L; -const GDS_LONG gds_grant_obj_notfound = 335544551L; -const GDS_LONG gds_grant_fld_notfound = 335544552L; -const GDS_LONG gds_grant_nopriv = 335544553L; -const GDS_LONG gds_nonsql_security_rel = 335544554L; -const GDS_LONG gds_nonsql_security_fld = 335544555L; -const GDS_LONG gds_wal_cache_err = 335544556L; -const GDS_LONG gds_shutfail = 335544557L; -const GDS_LONG gds_check_constraint = 335544558L; -const GDS_LONG gds_bad_svc_handle = 335544559L; -const GDS_LONG gds_shutwarn = 335544560L; -const GDS_LONG gds_wrospbver = 335544561L; -const GDS_LONG gds_bad_spb_form = 335544562L; -const GDS_LONG gds_svcnotdef = 335544563L; -const GDS_LONG gds_no_jrn = 335544564L; -const GDS_LONG gds_transliteration_failed = 335544565L; -const GDS_LONG gds_start_cm_for_wal = 335544566L; -const GDS_LONG gds_wal_ovflow_log_required = 335544567L; -const GDS_LONG gds_text_subtype = 335544568L; -const GDS_LONG gds_dsql_error = 335544569L; -const GDS_LONG gds_dsql_command_err = 335544570L; -const GDS_LONG gds_dsql_constant_err = 335544571L; -const GDS_LONG gds_dsql_cursor_err = 335544572L; -const GDS_LONG gds_dsql_datatype_err = 335544573L; -const GDS_LONG gds_dsql_decl_err = 335544574L; -const GDS_LONG gds_dsql_cursor_update_err = 335544575L; -const GDS_LONG gds_dsql_cursor_open_err = 335544576L; -const GDS_LONG gds_dsql_cursor_close_err = 335544577L; -const GDS_LONG gds_dsql_field_err = 335544578L; -const GDS_LONG gds_dsql_internal_err = 335544579L; -const GDS_LONG gds_dsql_relation_err = 335544580L; -const GDS_LONG gds_dsql_procedure_err = 335544581L; -const GDS_LONG gds_dsql_request_err = 335544582L; -const GDS_LONG gds_dsql_sqlda_err = 335544583L; -const GDS_LONG gds_dsql_var_count_err = 335544584L; -const GDS_LONG gds_dsql_stmt_handle = 335544585L; -const GDS_LONG gds_dsql_function_err = 335544586L; -const GDS_LONG gds_dsql_blob_err = 335544587L; -const GDS_LONG gds_collation_not_found = 335544588L; -const GDS_LONG gds_collation_not_for_charset = 335544589L; -const GDS_LONG gds_dsql_dup_option = 335544590L; -const GDS_LONG gds_dsql_tran_err = 335544591L; -const GDS_LONG gds_dsql_invalid_array = 335544592L; -const GDS_LONG gds_dsql_max_arr_dim_exceeded = 335544593L; -const GDS_LONG gds_dsql_arr_range_error = 335544594L; -const GDS_LONG gds_dsql_trigger_err = 335544595L; -const GDS_LONG gds_dsql_subselect_err = 335544596L; -const GDS_LONG gds_dsql_crdb_prepare_err = 335544597L; -const GDS_LONG gds_specify_field_err = 335544598L; -const GDS_LONG gds_num_field_err = 335544599L; -const GDS_LONG gds_col_name_err = 335544600L; -const GDS_LONG gds_where_err = 335544601L; -const GDS_LONG gds_table_view_err = 335544602L; -const GDS_LONG gds_distinct_err = 335544603L; -const GDS_LONG gds_key_field_count_err = 335544604L; -const GDS_LONG gds_subquery_err = 335544605L; -const GDS_LONG gds_expression_eval_err = 335544606L; -const GDS_LONG gds_node_err = 335544607L; -const GDS_LONG gds_command_end_err = 335544608L; -const GDS_LONG gds_index_name = 335544609L; -const GDS_LONG gds_exception_name = 335544610L; -const GDS_LONG gds_field_name = 335544611L; -const GDS_LONG gds_token_err = 335544612L; -const GDS_LONG gds_union_err = 335544613L; -const GDS_LONG gds_dsql_construct_err = 335544614L; -const GDS_LONG gds_field_aggregate_err = 335544615L; -const GDS_LONG gds_field_ref_err = 335544616L; -const GDS_LONG gds_order_by_err = 335544617L; -const GDS_LONG gds_return_mode_err = 335544618L; -const GDS_LONG gds_extern_func_err = 335544619L; -const GDS_LONG gds_alias_conflict_err = 335544620L; -const GDS_LONG gds_procedure_conflict_error = 335544621L; -const GDS_LONG gds_relation_conflict_err = 335544622L; -const GDS_LONG gds_dsql_domain_err = 335544623L; -const GDS_LONG gds_idx_seg_err = 335544624L; -const GDS_LONG gds_node_name_err = 335544625L; -const GDS_LONG gds_table_name = 335544626L; -const GDS_LONG gds_proc_name = 335544627L; -const GDS_LONG gds_idx_create_err = 335544628L; -const GDS_LONG gds_wal_shadow_err = 335544629L; -const GDS_LONG gds_dependency = 335544630L; -const GDS_LONG gds_idx_key_err = 335544631L; -const GDS_LONG gds_dsql_file_length_err = 335544632L; -const GDS_LONG gds_dsql_shadow_number_err = 335544633L; -const GDS_LONG gds_dsql_token_unk_err = 335544634L; -const GDS_LONG gds_dsql_no_relation_alias = 335544635L; -const GDS_LONG gds_indexname = 335544636L; -const GDS_LONG gds_no_stream_plan = 335544637L; -const GDS_LONG gds_stream_twice = 335544638L; -const GDS_LONG gds_stream_not_found = 335544639L; -const GDS_LONG gds_collation_requires_text = 335544640L; -const GDS_LONG gds_dsql_domain_not_found = 335544641L; -const GDS_LONG gds_index_unused = 335544642L; -const GDS_LONG gds_dsql_self_join = 335544643L; -const GDS_LONG gds_stream_bof = 335544644L; -const GDS_LONG gds_stream_crack = 335544645L; -const GDS_LONG gds_db_or_file_exists = 335544646L; -const GDS_LONG gds_invalid_operator = 335544647L; -const GDS_LONG gds_conn_lost = 335544648L; -const GDS_LONG gds_bad_checksum = 335544649L; -const GDS_LONG gds_page_type_err = 335544650L; -const GDS_LONG gds_ext_readonly_err = 335544651L; -const GDS_LONG gds_sing_select_err = 335544652L; -const GDS_LONG gds_psw_attach = 335544653L; -const GDS_LONG gds_psw_start_trans = 335544654L; -const GDS_LONG gds_invalid_direction = 335544655L; -const GDS_LONG gds_dsql_var_conflict = 335544656L; -const GDS_LONG gds_dsql_no_blob_array = 335544657L; -const GDS_LONG gds_dsql_base_table = 335544658L; -const GDS_LONG gds_duplicate_base_table = 335544659L; -const GDS_LONG gds_view_alias = 335544660L; -const GDS_LONG gds_index_root_page_full = 335544661L; -const GDS_LONG gds_dsql_blob_type_unknown = 335544662L; -const GDS_LONG gds_req_max_clones_exceeded = 335544663L; -const GDS_LONG gds_dsql_duplicate_spec = 335544664L; -const GDS_LONG gds_unique_key_violation = 335544665L; -const GDS_LONG gds_srvr_version_too_old = 335544666L; -const GDS_LONG gds_drdb_completed_with_errs = 335544667L; -const GDS_LONG gds_dsql_procedure_use_err = 335544668L; -const GDS_LONG gds_dsql_count_mismatch = 335544669L; -const GDS_LONG gds_blob_idx_err = 335544670L; -const GDS_LONG gds_array_idx_err = 335544671L; -const GDS_LONG gds_key_field_err = 335544672L; -const GDS_LONG gds_no_delete = 335544673L; -const GDS_LONG gds_del_last_field = 335544674L; -const GDS_LONG gds_sort_err = 335544675L; -const GDS_LONG gds_sort_mem_err = 335544676L; -const GDS_LONG gds_version_err = 335544677L; -const GDS_LONG gds_inval_key_posn = 335544678L; -const GDS_LONG gds_no_segments_err = 335544679L; -const GDS_LONG gds_crrp_data_err = 335544680L; -const GDS_LONG gds_rec_size_err = 335544681L; -const GDS_LONG gds_dsql_field_ref = 335544682L; -const GDS_LONG gds_req_depth_exceeded = 335544683L; -const GDS_LONG gds_no_field_access = 335544684L; -const GDS_LONG gds_no_dbkey = 335544685L; -const GDS_LONG gds_jrn_format_err = 335544686L; -const GDS_LONG gds_jrn_file_full = 335544687L; -const GDS_LONG gds_dsql_open_cursor_request = 335544688L; -const GDS_LONG gds_ib_error = 335544689L; -const GDS_LONG gds_cache_redef = 335544690L; -const GDS_LONG gds_cache_too_small = 335544691L; -const GDS_LONG gds_log_redef = 335544692L; -const GDS_LONG gds_log_too_small = 335544693L; -const GDS_LONG gds_partition_too_small = 335544694L; -const GDS_LONG gds_partition_not_supp = 335544695L; -const GDS_LONG gds_log_length_spec = 335544696L; -const GDS_LONG gds_precision_err = 335544697L; -const GDS_LONG gds_scale_nogt = 335544698L; -const GDS_LONG gds_expec_short = 335544699L; -const GDS_LONG gds_expec_long = 335544700L; -const GDS_LONG gds_expec_ushort = 335544701L; -const GDS_LONG gds_like_escape_invalid = 335544702L; -const GDS_LONG gds_svcnoexe = 335544703L; -const GDS_LONG gds_net_lookup_err = 335544704L; -const GDS_LONG gds_service_unknown = 335544705L; -const GDS_LONG gds_host_unknown = 335544706L; -const GDS_LONG gds_grant_nopriv_on_base = 335544707L; -const GDS_LONG gds_dyn_fld_ambiguous = 335544708L; -const GDS_LONG gds_dsql_agg_ref_err = 335544709L; -const GDS_LONG gds_complex_view = 335544710L; -const GDS_LONG gds_unprepared_stmt = 335544711L; -const GDS_LONG gds_expec_positive = 335544712L; -const GDS_LONG gds_dsql_sqlda_value_err = 335544713L; -const GDS_LONG gds_invalid_array_id = 335544714L; -const GDS_LONG gds_extfile_uns_op = 335544715L; -const GDS_LONG gds_svc_in_use = 335544716L; -const GDS_LONG gds_err_stack_limit = 335544717L; -const GDS_LONG gds_invalid_key = 335544718L; -const GDS_LONG gds_net_init_error = 335544719L; -const GDS_LONG gds_loadlib_failure = 335544720L; -const GDS_LONG gds_network_error = 335544721L; -const GDS_LONG gds_net_connect_err = 335544722L; -const GDS_LONG gds_net_connect_listen_err = 335544723L; -const GDS_LONG gds_net_event_connect_err = 335544724L; -const GDS_LONG gds_net_event_listen_err = 335544725L; -const GDS_LONG gds_net_read_err = 335544726L; -const GDS_LONG gds_net_write_err = 335544727L; -const GDS_LONG gds_integ_index_deactivate = 335544728L; -const GDS_LONG gds_integ_deactivate_primary = 335544729L; -const GDS_LONG gds_cse_not_supported = 335544730L; -const GDS_LONG gds_tra_must_sweep = 335544731L; -const GDS_LONG gds_unsupported_network_drive = 335544732L; -const GDS_LONG gds_io_create_err = 335544733L; -const GDS_LONG gds_io_open_err = 335544734L; -const GDS_LONG gds_io_close_err = 335544735L; -const GDS_LONG gds_io_read_err = 335544736L; -const GDS_LONG gds_io_write_err = 335544737L; -const GDS_LONG gds_io_delete_err = 335544738L; -const GDS_LONG gds_io_access_err = 335544739L; -const GDS_LONG gds_udf_exception = 335544740L; -const GDS_LONG gds_lost_db_connection = 335544741L; -const GDS_LONG gds_no_write_user_priv = 335544742L; -const GDS_LONG gds_token_too_long = 335544743L; -const GDS_LONG gds_max_att_exceeded = 335544744L; -const GDS_LONG gds_login_same_as_role_name = 335544745L; -const GDS_LONG gds_reftable_requires_pk = 335544746L; -const GDS_LONG gds_usrname_too_long = 335544747L; -const GDS_LONG gds_password_too_long = 335544748L; -const GDS_LONG gds_usrname_required = 335544749L; -const GDS_LONG gds_password_required = 335544750L; -const GDS_LONG gds_bad_protocol = 335544751L; -const GDS_LONG gds_dup_usrname_found = 335544752L; -const GDS_LONG gds_usrname_not_found = 335544753L; -const GDS_LONG gds_error_adding_sec_record = 335544754L; -const GDS_LONG gds_error_modifying_sec_record = 335544755L; -const GDS_LONG gds_error_deleting_sec_record = 335544756L; -const GDS_LONG gds_error_updating_sec_db = 335544757L; -const GDS_LONG gds_sort_rec_size_err = 335544758L; -const GDS_LONG gds_bad_default_value = 335544759L; -const GDS_LONG gds_invalid_clause = 335544760L; -const GDS_LONG gds_too_many_handles = 335544761L; -const GDS_LONG gds_optimizer_blk_exc = 335544762L; -const GDS_LONG gds_invalid_string_constant = 335544763L; -const GDS_LONG gds_transitional_date = 335544764L; -const GDS_LONG gds_read_only_database = 335544765L; -const GDS_LONG gds_must_be_dialect_2_and_up = 335544766L; -const GDS_LONG gds_blob_filter_exception = 335544767L; -const GDS_LONG gds_exception_access_violation = 335544768L; -const GDS_LONG gds_exception_datatype_missalignment = 335544769L; -const GDS_LONG gds_exception_array_bounds_exceeded = 335544770L; -const GDS_LONG gds_exception_float_denormal_operand = 335544771L; -const GDS_LONG gds_exception_float_divide_by_zero = 335544772L; -const GDS_LONG gds_exception_float_inexact_result = 335544773L; -const GDS_LONG gds_exception_float_invalid_operand = 335544774L; -const GDS_LONG gds_exception_float_overflow = 335544775L; -const GDS_LONG gds_exception_float_stack_check = 335544776L; -const GDS_LONG gds_exception_float_underflow = 335544777L; -const GDS_LONG gds_exception_integer_divide_by_zero = 335544778L; -const GDS_LONG gds_exception_integer_overflow = 335544779L; -const GDS_LONG gds_exception_unknown = 335544780L; -const GDS_LONG gds_exception_stack_overflow = 335544781L; -const GDS_LONG gds_exception_sigsegv = 335544782L; -const GDS_LONG gds_exception_sigill = 335544783L; -const GDS_LONG gds_exception_sigbus = 335544784L; -const GDS_LONG gds_exception_sigfpe = 335544785L; -const GDS_LONG gds_ext_file_delete = 335544786L; -const GDS_LONG gds_ext_file_modify = 335544787L; -const GDS_LONG gds_adm_task_denied = 335544788L; -const GDS_LONG gds_extract_input_mismatch = 335544789L; -const GDS_LONG gds_insufficient_svc_privileges = 335544790L; -const GDS_LONG gds_file_in_use = 335544791L; -const GDS_LONG gds_service_att_err = 335544792L; -const GDS_LONG gds_ddl_not_allowed_by_db_sql_dial = 335544793L; -const GDS_LONG gds_cancelled = 335544794L; -const GDS_LONG gds_unexp_spb_form = 335544795L; -const GDS_LONG gds_sql_dialect_datatype_unsupport = 335544796L; -const GDS_LONG gds_svcnouser = 335544797L; -const GDS_LONG gds_depend_on_uncommitted_rel = 335544798L; -const GDS_LONG gds_svc_name_missing = 335544799L; -const GDS_LONG gds_too_many_contexts = 335544800L; -const GDS_LONG gds_datype_notsup = 335544801L; -const GDS_LONG gds_dialect_reset_warning = 335544802L; -const GDS_LONG gds_dialect_not_changed = 335544803L; -const GDS_LONG gds_database_create_failed = 335544804L; -const GDS_LONG gds_inv_dialect_specified = 335544805L; -const GDS_LONG gds_valid_db_dialects = 335544806L; -const GDS_LONG gds_sqlwarn = 335544807L; -const GDS_LONG gds_dtype_renamed = 335544808L; -const GDS_LONG gds_extern_func_dir_error = 335544809L; -const GDS_LONG gds_date_range_exceeded = 335544810L; -const GDS_LONG gds_inv_client_dialect_specified = 335544811L; -const GDS_LONG gds_valid_client_dialects = 335544812L; -const GDS_LONG gds_optimizer_between_err = 335544813L; -const GDS_LONG gds_service_not_supported = 335544814L; -const GDS_LONG gds_generator_name = 335544815L; -const GDS_LONG gds_udf_name = 335544816L; -const GDS_LONG gds_bad_limit_param = 335544817L; -const GDS_LONG gds_bad_skip_param = 335544818L; -const GDS_LONG gds_io_32bit_exceeded_err = 335544819L; -const GDS_LONG gds_invalid_savepoint = 335544820L; -const GDS_LONG gds_gfix_db_name = 335740929L; -const GDS_LONG gds_gfix_invalid_sw = 335740930L; -const GDS_LONG gds_gfix_incmp_sw = 335740932L; -const GDS_LONG gds_gfix_replay_req = 335740933L; -const GDS_LONG gds_gfix_pgbuf_req = 335740934L; -const GDS_LONG gds_gfix_val_req = 335740935L; -const GDS_LONG gds_gfix_pval_req = 335740936L; -const GDS_LONG gds_gfix_trn_req = 335740937L; -const GDS_LONG gds_gfix_full_req = 335740940L; -const GDS_LONG gds_gfix_usrname_req = 335740941L; -const GDS_LONG gds_gfix_pass_req = 335740942L; -const GDS_LONG gds_gfix_subs_name = 335740943L; -const GDS_LONG gds_gfix_wal_req = 335740944L; -const GDS_LONG gds_gfix_sec_req = 335740945L; -const GDS_LONG gds_gfix_nval_req = 335740946L; -const GDS_LONG gds_gfix_type_shut = 335740947L; -const GDS_LONG gds_gfix_retry = 335740948L; -const GDS_LONG gds_gfix_retry_db = 335740951L; -const GDS_LONG gds_gfix_exceed_max = 335740991L; -const GDS_LONG gds_gfix_corrupt_pool = 335740992L; -const GDS_LONG gds_gfix_mem_exhausted = 335740993L; -const GDS_LONG gds_gfix_bad_pool = 335740994L; -const GDS_LONG gds_gfix_trn_not_valid = 335740995L; -const GDS_LONG gds_gfix_unexp_eoi = 335741012L; -const GDS_LONG gds_gfix_recon_fail = 335741018L; -const GDS_LONG gds_gfix_trn_unknown = 335741036L; -const GDS_LONG gds_gfix_mode_req = 335741038L; -const GDS_LONG gds_gfix_opt_SQL_dialect = 335741039L; -const GDS_LONG gds_dsql_dbkey_from_non_table = 336003074L; -const GDS_LONG gds_dsql_transitional_numeric = 336003075L; -const GDS_LONG gds_dsql_dialect_warning_expr = 336003076L; -const GDS_LONG gds_sql_db_dialect_dtype_unsupport = 336003077L; -const GDS_LONG gds_isc_sql_dialect_conflict_num = 336003079L; -const GDS_LONG gds_dsql_warning_number_ambiguous = 336003080L; -const GDS_LONG gds_dsql_warning_number_ambiguous1 = 336003081L; -const GDS_LONG gds_dsql_warn_precision_ambiguous = 336003082L; -const GDS_LONG gds_dsql_warn_precision_ambiguous1 = 336003083L; -const GDS_LONG gds_dsql_warn_precision_ambiguous2 = 336003084L; -const GDS_LONG gds_dsql_ambiguous_field_name = 336003085L; -const GDS_LONG gds_dsql_udf_return_pos_err = 336003086L; -const GDS_LONG gds_dyn_role_does_not_exist = 336068796L; -const GDS_LONG gds_dyn_no_grant_admin_opt = 336068797L; -const GDS_LONG gds_dyn_user_not_role_member = 336068798L; -const GDS_LONG gds_dyn_delete_role_failed = 336068799L; -const GDS_LONG gds_dyn_grant_role_to_user = 336068800L; -const GDS_LONG gds_dyn_inv_sql_role_name = 336068801L; -const GDS_LONG gds_dyn_dup_sql_role = 336068802L; -const GDS_LONG gds_dyn_kywd_spec_for_role = 336068803L; -const GDS_LONG gds_dyn_roles_not_supported = 336068804L; -const GDS_LONG gds_dyn_domain_name_exists = 336068812L; -const GDS_LONG gds_dyn_field_name_exists = 336068813L; -const GDS_LONG gds_dyn_dependency_exists = 336068814L; -const GDS_LONG gds_dyn_dtype_invalid = 336068815L; -const GDS_LONG gds_dyn_char_fld_too_small = 336068816L; -const GDS_LONG gds_dyn_invalid_dtype_conversion = 336068817L; -const GDS_LONG gds_dyn_dtype_conv_invalid = 336068818L; -const GDS_LONG gds_dyn_zero_len_id = 336068820L; -const GDS_LONG gds_gbak_unknown_switch = 336330753L; -const GDS_LONG gds_gbak_page_size_missing = 336330754L; -const GDS_LONG gds_gbak_page_size_toobig = 336330755L; -const GDS_LONG gds_gbak_redir_ouput_missing = 336330756L; -const GDS_LONG gds_gbak_switches_conflict = 336330757L; -const GDS_LONG gds_gbak_unknown_device = 336330758L; -const GDS_LONG gds_gbak_no_protection = 336330759L; -const GDS_LONG gds_gbak_page_size_not_allowed = 336330760L; -const GDS_LONG gds_gbak_multi_source_dest = 336330761L; -const GDS_LONG gds_gbak_filename_missing = 336330762L; -const GDS_LONG gds_gbak_dup_inout_names = 336330763L; -const GDS_LONG gds_gbak_inv_page_size = 336330764L; -const GDS_LONG gds_gbak_db_specified = 336330765L; -const GDS_LONG gds_gbak_db_exists = 336330766L; -const GDS_LONG gds_gbak_unk_device = 336330767L; -const GDS_LONG gds_gbak_blob_info_failed = 336330772L; -const GDS_LONG gds_gbak_unk_blob_item = 336330773L; -const GDS_LONG gds_gbak_get_seg_failed = 336330774L; -const GDS_LONG gds_gbak_close_blob_failed = 336330775L; -const GDS_LONG gds_gbak_open_blob_failed = 336330776L; -const GDS_LONG gds_gbak_put_blr_gen_id_failed = 336330777L; -const GDS_LONG gds_gbak_unk_type = 336330778L; -const GDS_LONG gds_gbak_comp_req_failed = 336330779L; -const GDS_LONG gds_gbak_start_req_failed = 336330780L; -const GDS_LONG gds_gbak_rec_failed = 336330781L; -const GDS_LONG gds_gbak_rel_req_failed = 336330782L; -const GDS_LONG gds_gbak_db_info_failed = 336330783L; -const GDS_LONG gds_gbak_no_db_desc = 336330784L; -const GDS_LONG gds_gbak_db_create_failed = 336330785L; -const GDS_LONG gds_gbak_decomp_len_error = 336330786L; -const GDS_LONG gds_gbak_tbl_missing = 336330787L; -const GDS_LONG gds_gbak_blob_col_missing = 336330788L; -const GDS_LONG gds_gbak_create_blob_failed = 336330789L; -const GDS_LONG gds_gbak_put_seg_failed = 336330790L; -const GDS_LONG gds_gbak_rec_len_exp = 336330791L; -const GDS_LONG gds_gbak_inv_rec_len = 336330792L; -const GDS_LONG gds_gbak_exp_data_type = 336330793L; -const GDS_LONG gds_gbak_gen_id_failed = 336330794L; -const GDS_LONG gds_gbak_unk_rec_type = 336330795L; -const GDS_LONG gds_gbak_inv_bkup_ver = 336330796L; -const GDS_LONG gds_gbak_missing_bkup_desc = 336330797L; -const GDS_LONG gds_gbak_string_trunc = 336330798L; -const GDS_LONG gds_gbak_cant_rest_record = 336330799L; -const GDS_LONG gds_gbak_send_failed = 336330800L; -const GDS_LONG gds_gbak_no_tbl_name = 336330801L; -const GDS_LONG gds_gbak_unexp_eof = 336330802L; -const GDS_LONG gds_gbak_db_format_too_old = 336330803L; -const GDS_LONG gds_gbak_inv_array_dim = 336330804L; -const GDS_LONG gds_gbak_xdr_len_expected = 336330807L; -const GDS_LONG gds_gbak_open_bkup_error = 336330817L; -const GDS_LONG gds_gbak_open_error = 336330818L; -const GDS_LONG gds_gbak_missing_block_fac = 336330934L; -const GDS_LONG gds_gbak_inv_block_fac = 336330935L; -const GDS_LONG gds_gbak_block_fac_specified = 336330936L; -const GDS_LONG gds_gbak_missing_username = 336330940L; -const GDS_LONG gds_gbak_missing_password = 336330941L; -const GDS_LONG gds_gbak_missing_skipped_bytes = 336330952L; -const GDS_LONG gds_gbak_inv_skipped_bytes = 336330953L; -const GDS_LONG gds_gbak_err_restore_charset = 336330965L; -const GDS_LONG gds_gbak_err_restore_collation = 336330967L; -const GDS_LONG gds_gbak_read_error = 336330972L; -const GDS_LONG gds_gbak_write_error = 336330973L; -const GDS_LONG gds_gbak_db_in_use = 336330985L; -const GDS_LONG gds_gbak_sysmemex = 336330990L; -const GDS_LONG gds_gbak_restore_role_failed = 336331002L; -const GDS_LONG gds_gbak_role_op_missing = 336331005L; -const GDS_LONG gds_gbak_page_buffers_missing = 336331010L; -const GDS_LONG gds_gbak_page_buffers_wrong_param = 336331011L; -const GDS_LONG gds_gbak_page_buffers_restore = 336331012L; -const GDS_LONG gds_gbak_inv_size = 336331014L; -const GDS_LONG gds_gbak_file_outof_sequence = 336331015L; -const GDS_LONG gds_gbak_join_file_missing = 336331016L; -const GDS_LONG gds_gbak_stdin_not_supptd = 336331017L; -const GDS_LONG gds_gbak_stdout_not_supptd = 336331018L; -const GDS_LONG gds_gbak_bkup_corrupt = 336331019L; -const GDS_LONG gds_gbak_unk_db_file_spec = 336331020L; -const GDS_LONG gds_gbak_hdr_write_failed = 336331021L; -const GDS_LONG gds_gbak_disk_space_ex = 336331022L; -const GDS_LONG gds_gbak_size_lt_min = 336331023L; -const GDS_LONG gds_gbak_svc_name_missing = 336331025L; -const GDS_LONG gds_gbak_not_ownr = 336331026L; -const GDS_LONG gds_gbak_mode_req = 336331031L; -const GDS_LONG gds_gbak_just_data = 336331033L; -const GDS_LONG gds_gbak_data_only = 336331034L; -const GDS_LONG gds_gsec_cant_open_db = 336723983L; -const GDS_LONG gds_gsec_switches_error = 336723984L; -const GDS_LONG gds_gsec_no_op_spec = 336723985L; -const GDS_LONG gds_gsec_no_usr_name = 336723986L; -const GDS_LONG gds_gsec_err_add = 336723987L; -const GDS_LONG gds_gsec_err_modify = 336723988L; -const GDS_LONG gds_gsec_err_find_mod = 336723989L; -const GDS_LONG gds_gsec_err_rec_not_found = 336723990L; -const GDS_LONG gds_gsec_err_delete = 336723991L; -const GDS_LONG gds_gsec_err_find_del = 336723992L; -const GDS_LONG gds_gsec_err_find_disp = 336723996L; -const GDS_LONG gds_gsec_inv_param = 336723997L; -const GDS_LONG gds_gsec_op_specified = 336723998L; -const GDS_LONG gds_gsec_pw_specified = 336723999L; -const GDS_LONG gds_gsec_uid_specified = 336724000L; -const GDS_LONG gds_gsec_gid_specified = 336724001L; -const GDS_LONG gds_gsec_proj_specified = 336724002L; -const GDS_LONG gds_gsec_org_specified = 336724003L; -const GDS_LONG gds_gsec_fname_specified = 336724004L; -const GDS_LONG gds_gsec_mname_specified = 336724005L; -const GDS_LONG gds_gsec_lname_specified = 336724006L; -const GDS_LONG gds_gsec_inv_switch = 336724008L; -const GDS_LONG gds_gsec_amb_switch = 336724009L; -const GDS_LONG gds_gsec_no_op_specified = 336724010L; -const GDS_LONG gds_gsec_params_not_allowed = 336724011L; -const GDS_LONG gds_gsec_incompat_switch = 336724012L; -const GDS_LONG gds_gsec_inv_username = 336724044L; -const GDS_LONG gds_gsec_inv_pw_length = 336724045L; -const GDS_LONG gds_gsec_db_specified = 336724046L; -const GDS_LONG gds_gsec_db_admin_specified = 336724047L; -const GDS_LONG gds_gsec_db_admin_pw_specified = 336724048L; -const GDS_LONG gds_gsec_sql_role_specified = 336724049L; -const GDS_LONG gds_license_no_file = 336789504L; -const GDS_LONG gds_license_op_specified = 336789523L; -const GDS_LONG gds_license_op_missing = 336789524L; -const GDS_LONG gds_license_inv_switch = 336789525L; -const GDS_LONG gds_license_inv_switch_combo = 336789526L; -const GDS_LONG gds_license_inv_op_combo = 336789527L; -const GDS_LONG gds_license_amb_switch = 336789528L; -const GDS_LONG gds_license_inv_parameter = 336789529L; -const GDS_LONG gds_license_param_specified = 336789530L; -const GDS_LONG gds_license_param_req = 336789531L; -const GDS_LONG gds_license_syntx_error = 336789532L; -const GDS_LONG gds_license_dup_id = 336789534L; -const GDS_LONG gds_license_inv_id_key = 336789535L; -const GDS_LONG gds_license_err_remove = 336789536L; -const GDS_LONG gds_license_err_update = 336789537L; -const GDS_LONG gds_license_err_convert = 336789538L; -const GDS_LONG gds_license_err_unk = 336789539L; -const GDS_LONG gds_license_svc_err_add = 336789540L; -const GDS_LONG gds_license_svc_err_remove = 336789541L; -const GDS_LONG gds_license_eval_exists = 336789563L; -const GDS_LONG gds_gstat_unknown_switch = 336920577L; -const GDS_LONG gds_gstat_retry = 336920578L; -const GDS_LONG gds_gstat_wrong_ods = 336920579L; -const GDS_LONG gds_gstat_unexpected_eof = 336920580L; -const GDS_LONG gds_gstat_open_err = 336920605L; -const GDS_LONG gds_gstat_read_err = 336920606L; -const GDS_LONG gds_gstat_sysmemex = 336920607L; -const GDS_LONG gds_err_max = 700L; +const SLONG gds_arith_except = 335544321L; +const SLONG gds_bad_dbkey = 335544322L; +const SLONG gds_bad_db_format = 335544323L; +const SLONG gds_bad_db_handle = 335544324L; +const SLONG gds_bad_dpb_content = 335544325L; +const SLONG gds_bad_dpb_form = 335544326L; +const SLONG gds_bad_req_handle = 335544327L; +const SLONG gds_bad_segstr_handle = 335544328L; +const SLONG gds_bad_segstr_id = 335544329L; +const SLONG gds_bad_tpb_content = 335544330L; +const SLONG gds_bad_tpb_form = 335544331L; +const SLONG gds_bad_trans_handle = 335544332L; +const SLONG gds_bug_check = 335544333L; +const SLONG gds_convert_error = 335544334L; +const SLONG gds_db_corrupt = 335544335L; +const SLONG gds_deadlock = 335544336L; +const SLONG gds_excess_trans = 335544337L; +const SLONG gds_from_no_match = 335544338L; +const SLONG gds_infinap = 335544339L; +const SLONG gds_infona = 335544340L; +const SLONG gds_infunk = 335544341L; +const SLONG gds_integ_fail = 335544342L; +const SLONG gds_invalid_blr = 335544343L; +const SLONG gds_io_error = 335544344L; +const SLONG gds_lock_conflict = 335544345L; +const SLONG gds_metadata_corrupt = 335544346L; +const SLONG gds_not_valid = 335544347L; +const SLONG gds_no_cur_rec = 335544348L; +const SLONG gds_no_dup = 335544349L; +const SLONG gds_no_finish = 335544350L; +const SLONG gds_no_meta_update = 335544351L; +const SLONG gds_no_priv = 335544352L; +const SLONG gds_no_recon = 335544353L; +const SLONG gds_no_record = 335544354L; +const SLONG gds_no_segstr_close = 335544355L; +const SLONG gds_obsolete_metadata = 335544356L; +const SLONG gds_open_trans = 335544357L; +const SLONG gds_port_len = 335544358L; +const SLONG gds_read_only_field = 335544359L; +const SLONG gds_read_only_rel = 335544360L; +const SLONG gds_read_only_trans = 335544361L; +const SLONG gds_read_only_view = 335544362L; +const SLONG gds_req_no_trans = 335544363L; +const SLONG gds_req_sync = 335544364L; +const SLONG gds_req_wrong_db = 335544365L; +const SLONG gds_segment = 335544366L; +const SLONG gds_segstr_eof = 335544367L; +const SLONG gds_segstr_no_op = 335544368L; +const SLONG gds_segstr_no_read = 335544369L; +const SLONG gds_segstr_no_trans = 335544370L; +const SLONG gds_segstr_no_write = 335544371L; +const SLONG gds_segstr_wrong_db = 335544372L; +const SLONG gds_sys_request = 335544373L; +const SLONG gds_stream_eof = 335544374L; +const SLONG gds_unavailable = 335544375L; +const SLONG gds_unres_rel = 335544376L; +const SLONG gds_uns_ext = 335544377L; +const SLONG gds_wish_list = 335544378L; +const SLONG gds_wrong_ods = 335544379L; +const SLONG gds_wronumarg = 335544380L; +const SLONG gds_imp_exc = 335544381L; +const SLONG gds_random = 335544382L; +const SLONG gds_fatal_conflict = 335544383L; +const SLONG gds_badblk = 335544384L; +const SLONG gds_invpoolcl = 335544385L; +const SLONG gds_nopoolids = 335544386L; +const SLONG gds_relbadblk = 335544387L; +const SLONG gds_blktoobig = 335544388L; +const SLONG gds_bufexh = 335544389L; +const SLONG gds_syntaxerr = 335544390L; +const SLONG gds_bufinuse = 335544391L; +const SLONG gds_bdbincon = 335544392L; +const SLONG gds_reqinuse = 335544393L; +const SLONG gds_badodsver = 335544394L; +const SLONG gds_relnotdef = 335544395L; +const SLONG gds_fldnotdef = 335544396L; +const SLONG gds_dirtypage = 335544397L; +const SLONG gds_waifortra = 335544398L; +const SLONG gds_doubleloc = 335544399L; +const SLONG gds_nodnotfnd = 335544400L; +const SLONG gds_dupnodfnd = 335544401L; +const SLONG gds_locnotmar = 335544402L; +const SLONG gds_badpagtyp = 335544403L; +const SLONG gds_corrupt = 335544404L; +const SLONG gds_badpage = 335544405L; +const SLONG gds_badindex = 335544406L; +const SLONG gds_dbbnotzer = 335544407L; +const SLONG gds_tranotzer = 335544408L; +const SLONG gds_trareqmis = 335544409L; +const SLONG gds_badhndcnt = 335544410L; +const SLONG gds_wrotpbver = 335544411L; +const SLONG gds_wroblrver = 335544412L; +const SLONG gds_wrodpbver = 335544413L; +const SLONG gds_blobnotsup = 335544414L; +const SLONG gds_badrelation = 335544415L; +const SLONG gds_nodetach = 335544416L; +const SLONG gds_notremote = 335544417L; +const SLONG gds_trainlim = 335544418L; +const SLONG gds_notinlim = 335544419L; +const SLONG gds_traoutsta = 335544420L; +const SLONG gds_connect_reject = 335544421L; +const SLONG gds_dbfile = 335544422L; +const SLONG gds_orphan = 335544423L; +const SLONG gds_no_lock_mgr = 335544424L; +const SLONG gds_ctxinuse = 335544425L; +const SLONG gds_ctxnotdef = 335544426L; +const SLONG gds_datnotsup = 335544427L; +const SLONG gds_badmsgnum = 335544428L; +const SLONG gds_badparnum = 335544429L; +const SLONG gds_virmemexh = 335544430L; +const SLONG gds_blocking_signal = 335544431L; +const SLONG gds_lockmanerr = 335544432L; +const SLONG gds_journerr = 335544433L; +const SLONG gds_keytoobig = 335544434L; +const SLONG gds_nullsegkey = 335544435L; +const SLONG gds_sqlerr = 335544436L; +const SLONG gds_wrodynver = 335544437L; +const SLONG gds_funnotdef = 335544438L; +const SLONG gds_funmismat = 335544439L; +const SLONG gds_bad_msg_vec = 335544440L; +const SLONG gds_bad_detach = 335544441L; +const SLONG gds_noargacc_read = 335544442L; +const SLONG gds_noargacc_write = 335544443L; +const SLONG gds_read_only = 335544444L; +const SLONG gds_ext_err = 335544445L; +const SLONG gds_non_updatable = 335544446L; +const SLONG gds_no_rollback = 335544447L; +const SLONG gds_bad_sec_info = 335544448L; +const SLONG gds_invalid_sec_info = 335544449L; +const SLONG gds_misc_interpreted = 335544450L; +const SLONG gds_update_conflict = 335544451L; +const SLONG gds_unlicensed = 335544452L; +const SLONG gds_obj_in_use = 335544453L; +const SLONG gds_nofilter = 335544454L; +const SLONG gds_shadow_accessed = 335544455L; +const SLONG gds_invalid_sdl = 335544456L; +const SLONG gds_out_of_bounds = 335544457L; +const SLONG gds_invalid_dimension = 335544458L; +const SLONG gds_rec_in_limbo = 335544459L; +const SLONG gds_shadow_missing = 335544460L; +const SLONG gds_cant_validate = 335544461L; +const SLONG gds_cant_start_journal = 335544462L; +const SLONG gds_gennotdef = 335544463L; +const SLONG gds_cant_start_logging = 335544464L; +const SLONG gds_bad_segstr_type = 335544465L; +const SLONG gds_foreign_key = 335544466L; +const SLONG gds_high_minor = 335544467L; +const SLONG gds_tra_state = 335544468L; +const SLONG gds_trans_invalid = 335544469L; +const SLONG gds_buf_invalid = 335544470L; +const SLONG gds_indexnotdefined = 335544471L; +const SLONG gds_login = 335544472L; +const SLONG gds_invalid_bookmark = 335544473L; +const SLONG gds_bad_lock_level = 335544474L; +const SLONG gds_relation_lock = 335544475L; +const SLONG gds_record_lock = 335544476L; +const SLONG gds_max_idx = 335544477L; +const SLONG gds_jrn_enable = 335544478L; +const SLONG gds_old_failure = 335544479L; +const SLONG gds_old_in_progress = 335544480L; +const SLONG gds_old_no_space = 335544481L; +const SLONG gds_no_wal_no_jrn = 335544482L; +const SLONG gds_num_old_files = 335544483L; +const SLONG gds_wal_file_open = 335544484L; +const SLONG gds_bad_stmt_handle = 335544485L; +const SLONG gds_wal_failure = 335544486L; +const SLONG gds_walw_err = 335544487L; +const SLONG gds_logh_small = 335544488L; +const SLONG gds_logh_inv_version = 335544489L; +const SLONG gds_logh_open_flag = 335544490L; +const SLONG gds_logh_open_flag2 = 335544491L; +const SLONG gds_logh_diff_dbname = 335544492L; +const SLONG gds_logf_unexpected_eof = 335544493L; +const SLONG gds_logr_incomplete = 335544494L; +const SLONG gds_logr_header_small = 335544495L; +const SLONG gds_logb_small = 335544496L; +const SLONG gds_wal_illegal_attach = 335544497L; +const SLONG gds_wal_invalid_wpb = 335544498L; +const SLONG gds_wal_err_rollover = 335544499L; +const SLONG gds_no_wal = 335544500L; +const SLONG gds_drop_wal = 335544501L; +const SLONG gds_stream_not_defined = 335544502L; +const SLONG gds_wal_subsys_error = 335544503L; +const SLONG gds_wal_subsys_corrupt = 335544504L; +const SLONG gds_no_archive = 335544505L; +const SLONG gds_shutinprog = 335544506L; +const SLONG gds_range_in_use = 335544507L; +const SLONG gds_range_not_found = 335544508L; +const SLONG gds_charset_not_found = 335544509L; +const SLONG gds_lock_timeout = 335544510L; +const SLONG gds_prcnotdef = 335544511L; +const SLONG gds_prcmismat = 335544512L; +const SLONG gds_wal_bugcheck = 335544513L; +const SLONG gds_wal_cant_expand = 335544514L; +const SLONG gds_codnotdef = 335544515L; +const SLONG gds_xcpnotdef = 335544516L; +const SLONG gds_except = 335544517L; +const SLONG gds_cache_restart = 335544518L; +const SLONG gds_bad_lock_handle = 335544519L; +const SLONG gds_jrn_present = 335544520L; +const SLONG gds_wal_err_rollover2 = 335544521L; +const SLONG gds_wal_err_logwrite = 335544522L; +const SLONG gds_wal_err_jrn_comm = 335544523L; +const SLONG gds_wal_err_expansion = 335544524L; +const SLONG gds_wal_err_setup = 335544525L; +const SLONG gds_wal_err_ww_sync = 335544526L; +const SLONG gds_wal_err_ww_start = 335544527L; +const SLONG gds_shutdown = 335544528L; +const SLONG gds_existing_priv_mod = 335544529L; +const SLONG gds_primary_key_ref = 335544530L; +const SLONG gds_primary_key_notnull = 335544531L; +const SLONG gds_ref_cnstrnt_notfound = 335544532L; +const SLONG gds_foreign_key_notfound = 335544533L; +const SLONG gds_ref_cnstrnt_update = 335544534L; +const SLONG gds_check_cnstrnt_update = 335544535L; +const SLONG gds_check_cnstrnt_del = 335544536L; +const SLONG gds_integ_index_seg_del = 335544537L; +const SLONG gds_integ_index_seg_mod = 335544538L; +const SLONG gds_integ_index_del = 335544539L; +const SLONG gds_integ_index_mod = 335544540L; +const SLONG gds_check_trig_del = 335544541L; +const SLONG gds_check_trig_update = 335544542L; +const SLONG gds_cnstrnt_fld_del = 335544543L; +const SLONG gds_cnstrnt_fld_rename = 335544544L; +const SLONG gds_rel_cnstrnt_update = 335544545L; +const SLONG gds_constaint_on_view = 335544546L; +const SLONG gds_invld_cnstrnt_type = 335544547L; +const SLONG gds_primary_key_exists = 335544548L; +const SLONG gds_systrig_update = 335544549L; +const SLONG gds_not_rel_owner = 335544550L; +const SLONG gds_grant_obj_notfound = 335544551L; +const SLONG gds_grant_fld_notfound = 335544552L; +const SLONG gds_grant_nopriv = 335544553L; +const SLONG gds_nonsql_security_rel = 335544554L; +const SLONG gds_nonsql_security_fld = 335544555L; +const SLONG gds_wal_cache_err = 335544556L; +const SLONG gds_shutfail = 335544557L; +const SLONG gds_check_constraint = 335544558L; +const SLONG gds_bad_svc_handle = 335544559L; +const SLONG gds_shutwarn = 335544560L; +const SLONG gds_wrospbver = 335544561L; +const SLONG gds_bad_spb_form = 335544562L; +const SLONG gds_svcnotdef = 335544563L; +const SLONG gds_no_jrn = 335544564L; +const SLONG gds_transliteration_failed = 335544565L; +const SLONG gds_start_cm_for_wal = 335544566L; +const SLONG gds_wal_ovflow_log_required = 335544567L; +const SLONG gds_text_subtype = 335544568L; +const SLONG gds_dsql_error = 335544569L; +const SLONG gds_dsql_command_err = 335544570L; +const SLONG gds_dsql_constant_err = 335544571L; +const SLONG gds_dsql_cursor_err = 335544572L; +const SLONG gds_dsql_datatype_err = 335544573L; +const SLONG gds_dsql_decl_err = 335544574L; +const SLONG gds_dsql_cursor_update_err = 335544575L; +const SLONG gds_dsql_cursor_open_err = 335544576L; +const SLONG gds_dsql_cursor_close_err = 335544577L; +const SLONG gds_dsql_field_err = 335544578L; +const SLONG gds_dsql_internal_err = 335544579L; +const SLONG gds_dsql_relation_err = 335544580L; +const SLONG gds_dsql_procedure_err = 335544581L; +const SLONG gds_dsql_request_err = 335544582L; +const SLONG gds_dsql_sqlda_err = 335544583L; +const SLONG gds_dsql_var_count_err = 335544584L; +const SLONG gds_dsql_stmt_handle = 335544585L; +const SLONG gds_dsql_function_err = 335544586L; +const SLONG gds_dsql_blob_err = 335544587L; +const SLONG gds_collation_not_found = 335544588L; +const SLONG gds_collation_not_for_charset = 335544589L; +const SLONG gds_dsql_dup_option = 335544590L; +const SLONG gds_dsql_tran_err = 335544591L; +const SLONG gds_dsql_invalid_array = 335544592L; +const SLONG gds_dsql_max_arr_dim_exceeded = 335544593L; +const SLONG gds_dsql_arr_range_error = 335544594L; +const SLONG gds_dsql_trigger_err = 335544595L; +const SLONG gds_dsql_subselect_err = 335544596L; +const SLONG gds_dsql_crdb_prepare_err = 335544597L; +const SLONG gds_specify_field_err = 335544598L; +const SLONG gds_num_field_err = 335544599L; +const SLONG gds_col_name_err = 335544600L; +const SLONG gds_where_err = 335544601L; +const SLONG gds_table_view_err = 335544602L; +const SLONG gds_distinct_err = 335544603L; +const SLONG gds_key_field_count_err = 335544604L; +const SLONG gds_subquery_err = 335544605L; +const SLONG gds_expression_eval_err = 335544606L; +const SLONG gds_node_err = 335544607L; +const SLONG gds_command_end_err = 335544608L; +const SLONG gds_index_name = 335544609L; +const SLONG gds_exception_name = 335544610L; +const SLONG gds_field_name = 335544611L; +const SLONG gds_token_err = 335544612L; +const SLONG gds_union_err = 335544613L; +const SLONG gds_dsql_construct_err = 335544614L; +const SLONG gds_field_aggregate_err = 335544615L; +const SLONG gds_field_ref_err = 335544616L; +const SLONG gds_order_by_err = 335544617L; +const SLONG gds_return_mode_err = 335544618L; +const SLONG gds_extern_func_err = 335544619L; +const SLONG gds_alias_conflict_err = 335544620L; +const SLONG gds_procedure_conflict_error = 335544621L; +const SLONG gds_relation_conflict_err = 335544622L; +const SLONG gds_dsql_domain_err = 335544623L; +const SLONG gds_idx_seg_err = 335544624L; +const SLONG gds_node_name_err = 335544625L; +const SLONG gds_table_name = 335544626L; +const SLONG gds_proc_name = 335544627L; +const SLONG gds_idx_create_err = 335544628L; +const SLONG gds_wal_shadow_err = 335544629L; +const SLONG gds_dependency = 335544630L; +const SLONG gds_idx_key_err = 335544631L; +const SLONG gds_dsql_file_length_err = 335544632L; +const SLONG gds_dsql_shadow_number_err = 335544633L; +const SLONG gds_dsql_token_unk_err = 335544634L; +const SLONG gds_dsql_no_relation_alias = 335544635L; +const SLONG gds_indexname = 335544636L; +const SLONG gds_no_stream_plan = 335544637L; +const SLONG gds_stream_twice = 335544638L; +const SLONG gds_stream_not_found = 335544639L; +const SLONG gds_collation_requires_text = 335544640L; +const SLONG gds_dsql_domain_not_found = 335544641L; +const SLONG gds_index_unused = 335544642L; +const SLONG gds_dsql_self_join = 335544643L; +const SLONG gds_stream_bof = 335544644L; +const SLONG gds_stream_crack = 335544645L; +const SLONG gds_db_or_file_exists = 335544646L; +const SLONG gds_invalid_operator = 335544647L; +const SLONG gds_conn_lost = 335544648L; +const SLONG gds_bad_checksum = 335544649L; +const SLONG gds_page_type_err = 335544650L; +const SLONG gds_ext_readonly_err = 335544651L; +const SLONG gds_sing_select_err = 335544652L; +const SLONG gds_psw_attach = 335544653L; +const SLONG gds_psw_start_trans = 335544654L; +const SLONG gds_invalid_direction = 335544655L; +const SLONG gds_dsql_var_conflict = 335544656L; +const SLONG gds_dsql_no_blob_array = 335544657L; +const SLONG gds_dsql_base_table = 335544658L; +const SLONG gds_duplicate_base_table = 335544659L; +const SLONG gds_view_alias = 335544660L; +const SLONG gds_index_root_page_full = 335544661L; +const SLONG gds_dsql_blob_type_unknown = 335544662L; +const SLONG gds_req_max_clones_exceeded = 335544663L; +const SLONG gds_dsql_duplicate_spec = 335544664L; +const SLONG gds_unique_key_violation = 335544665L; +const SLONG gds_srvr_version_too_old = 335544666L; +const SLONG gds_drdb_completed_with_errs = 335544667L; +const SLONG gds_dsql_procedure_use_err = 335544668L; +const SLONG gds_dsql_count_mismatch = 335544669L; +const SLONG gds_blob_idx_err = 335544670L; +const SLONG gds_array_idx_err = 335544671L; +const SLONG gds_key_field_err = 335544672L; +const SLONG gds_no_delete = 335544673L; +const SLONG gds_del_last_field = 335544674L; +const SLONG gds_sort_err = 335544675L; +const SLONG gds_sort_mem_err = 335544676L; +const SLONG gds_version_err = 335544677L; +const SLONG gds_inval_key_posn = 335544678L; +const SLONG gds_no_segments_err = 335544679L; +const SLONG gds_crrp_data_err = 335544680L; +const SLONG gds_rec_size_err = 335544681L; +const SLONG gds_dsql_field_ref = 335544682L; +const SLONG gds_req_depth_exceeded = 335544683L; +const SLONG gds_no_field_access = 335544684L; +const SLONG gds_no_dbkey = 335544685L; +const SLONG gds_jrn_format_err = 335544686L; +const SLONG gds_jrn_file_full = 335544687L; +const SLONG gds_dsql_open_cursor_request = 335544688L; +const SLONG gds_ib_error = 335544689L; +const SLONG gds_cache_redef = 335544690L; +const SLONG gds_cache_too_small = 335544691L; +const SLONG gds_log_redef = 335544692L; +const SLONG gds_log_too_small = 335544693L; +const SLONG gds_partition_too_small = 335544694L; +const SLONG gds_partition_not_supp = 335544695L; +const SLONG gds_log_length_spec = 335544696L; +const SLONG gds_precision_err = 335544697L; +const SLONG gds_scale_nogt = 335544698L; +const SLONG gds_expec_short = 335544699L; +const SLONG gds_expec_long = 335544700L; +const SLONG gds_expec_ushort = 335544701L; +const SLONG gds_like_escape_invalid = 335544702L; +const SLONG gds_svcnoexe = 335544703L; +const SLONG gds_net_lookup_err = 335544704L; +const SLONG gds_service_unknown = 335544705L; +const SLONG gds_host_unknown = 335544706L; +const SLONG gds_grant_nopriv_on_base = 335544707L; +const SLONG gds_dyn_fld_ambiguous = 335544708L; +const SLONG gds_dsql_agg_ref_err = 335544709L; +const SLONG gds_complex_view = 335544710L; +const SLONG gds_unprepared_stmt = 335544711L; +const SLONG gds_expec_positive = 335544712L; +const SLONG gds_dsql_sqlda_value_err = 335544713L; +const SLONG gds_invalid_array_id = 335544714L; +const SLONG gds_extfile_uns_op = 335544715L; +const SLONG gds_svc_in_use = 335544716L; +const SLONG gds_err_stack_limit = 335544717L; +const SLONG gds_invalid_key = 335544718L; +const SLONG gds_net_init_error = 335544719L; +const SLONG gds_loadlib_failure = 335544720L; +const SLONG gds_network_error = 335544721L; +const SLONG gds_net_connect_err = 335544722L; +const SLONG gds_net_connect_listen_err = 335544723L; +const SLONG gds_net_event_connect_err = 335544724L; +const SLONG gds_net_event_listen_err = 335544725L; +const SLONG gds_net_read_err = 335544726L; +const SLONG gds_net_write_err = 335544727L; +const SLONG gds_integ_index_deactivate = 335544728L; +const SLONG gds_integ_deactivate_primary = 335544729L; +const SLONG gds_cse_not_supported = 335544730L; +const SLONG gds_tra_must_sweep = 335544731L; +const SLONG gds_unsupported_network_drive = 335544732L; +const SLONG gds_io_create_err = 335544733L; +const SLONG gds_io_open_err = 335544734L; +const SLONG gds_io_close_err = 335544735L; +const SLONG gds_io_read_err = 335544736L; +const SLONG gds_io_write_err = 335544737L; +const SLONG gds_io_delete_err = 335544738L; +const SLONG gds_io_access_err = 335544739L; +const SLONG gds_udf_exception = 335544740L; +const SLONG gds_lost_db_connection = 335544741L; +const SLONG gds_no_write_user_priv = 335544742L; +const SLONG gds_token_too_long = 335544743L; +const SLONG gds_max_att_exceeded = 335544744L; +const SLONG gds_login_same_as_role_name = 335544745L; +const SLONG gds_reftable_requires_pk = 335544746L; +const SLONG gds_usrname_too_long = 335544747L; +const SLONG gds_password_too_long = 335544748L; +const SLONG gds_usrname_required = 335544749L; +const SLONG gds_password_required = 335544750L; +const SLONG gds_bad_protocol = 335544751L; +const SLONG gds_dup_usrname_found = 335544752L; +const SLONG gds_usrname_not_found = 335544753L; +const SLONG gds_error_adding_sec_record = 335544754L; +const SLONG gds_error_modifying_sec_record = 335544755L; +const SLONG gds_error_deleting_sec_record = 335544756L; +const SLONG gds_error_updating_sec_db = 335544757L; +const SLONG gds_sort_rec_size_err = 335544758L; +const SLONG gds_bad_default_value = 335544759L; +const SLONG gds_invalid_clause = 335544760L; +const SLONG gds_too_many_handles = 335544761L; +const SLONG gds_optimizer_blk_exc = 335544762L; +const SLONG gds_invalid_string_constant = 335544763L; +const SLONG gds_transitional_date = 335544764L; +const SLONG gds_read_only_database = 335544765L; +const SLONG gds_must_be_dialect_2_and_up = 335544766L; +const SLONG gds_blob_filter_exception = 335544767L; +const SLONG gds_exception_access_violation = 335544768L; +const SLONG gds_exception_datatype_missalignment = 335544769L; +const SLONG gds_exception_array_bounds_exceeded = 335544770L; +const SLONG gds_exception_float_denormal_operand = 335544771L; +const SLONG gds_exception_float_divide_by_zero = 335544772L; +const SLONG gds_exception_float_inexact_result = 335544773L; +const SLONG gds_exception_float_invalid_operand = 335544774L; +const SLONG gds_exception_float_overflow = 335544775L; +const SLONG gds_exception_float_stack_check = 335544776L; +const SLONG gds_exception_float_underflow = 335544777L; +const SLONG gds_exception_integer_divide_by_zero = 335544778L; +const SLONG gds_exception_integer_overflow = 335544779L; +const SLONG gds_exception_unknown = 335544780L; +const SLONG gds_exception_stack_overflow = 335544781L; +const SLONG gds_exception_sigsegv = 335544782L; +const SLONG gds_exception_sigill = 335544783L; +const SLONG gds_exception_sigbus = 335544784L; +const SLONG gds_exception_sigfpe = 335544785L; +const SLONG gds_ext_file_delete = 335544786L; +const SLONG gds_ext_file_modify = 335544787L; +const SLONG gds_adm_task_denied = 335544788L; +const SLONG gds_extract_input_mismatch = 335544789L; +const SLONG gds_insufficient_svc_privileges = 335544790L; +const SLONG gds_file_in_use = 335544791L; +const SLONG gds_service_att_err = 335544792L; +const SLONG gds_ddl_not_allowed_by_db_sql_dial = 335544793L; +const SLONG gds_cancelled = 335544794L; +const SLONG gds_unexp_spb_form = 335544795L; +const SLONG gds_sql_dialect_datatype_unsupport = 335544796L; +const SLONG gds_svcnouser = 335544797L; +const SLONG gds_depend_on_uncommitted_rel = 335544798L; +const SLONG gds_svc_name_missing = 335544799L; +const SLONG gds_too_many_contexts = 335544800L; +const SLONG gds_datype_notsup = 335544801L; +const SLONG gds_dialect_reset_warning = 335544802L; +const SLONG gds_dialect_not_changed = 335544803L; +const SLONG gds_database_create_failed = 335544804L; +const SLONG gds_inv_dialect_specified = 335544805L; +const SLONG gds_valid_db_dialects = 335544806L; +const SLONG gds_sqlwarn = 335544807L; +const SLONG gds_dtype_renamed = 335544808L; +const SLONG gds_extern_func_dir_error = 335544809L; +const SLONG gds_date_range_exceeded = 335544810L; +const SLONG gds_inv_client_dialect_specified = 335544811L; +const SLONG gds_valid_client_dialects = 335544812L; +const SLONG gds_optimizer_between_err = 335544813L; +const SLONG gds_service_not_supported = 335544814L; +const SLONG gds_generator_name = 335544815L; +const SLONG gds_udf_name = 335544816L; +const SLONG gds_bad_limit_param = 335544817L; +const SLONG gds_bad_skip_param = 335544818L; +const SLONG gds_io_32bit_exceeded_err = 335544819L; +const SLONG gds_invalid_savepoint = 335544820L; +const SLONG gds_gfix_db_name = 335740929L; +const SLONG gds_gfix_invalid_sw = 335740930L; +const SLONG gds_gfix_incmp_sw = 335740932L; +const SLONG gds_gfix_replay_req = 335740933L; +const SLONG gds_gfix_pgbuf_req = 335740934L; +const SLONG gds_gfix_val_req = 335740935L; +const SLONG gds_gfix_pval_req = 335740936L; +const SLONG gds_gfix_trn_req = 335740937L; +const SLONG gds_gfix_full_req = 335740940L; +const SLONG gds_gfix_usrname_req = 335740941L; +const SLONG gds_gfix_pass_req = 335740942L; +const SLONG gds_gfix_subs_name = 335740943L; +const SLONG gds_gfix_wal_req = 335740944L; +const SLONG gds_gfix_sec_req = 335740945L; +const SLONG gds_gfix_nval_req = 335740946L; +const SLONG gds_gfix_type_shut = 335740947L; +const SLONG gds_gfix_retry = 335740948L; +const SLONG gds_gfix_retry_db = 335740951L; +const SLONG gds_gfix_exceed_max = 335740991L; +const SLONG gds_gfix_corrupt_pool = 335740992L; +const SLONG gds_gfix_mem_exhausted = 335740993L; +const SLONG gds_gfix_bad_pool = 335740994L; +const SLONG gds_gfix_trn_not_valid = 335740995L; +const SLONG gds_gfix_unexp_eoi = 335741012L; +const SLONG gds_gfix_recon_fail = 335741018L; +const SLONG gds_gfix_trn_unknown = 335741036L; +const SLONG gds_gfix_mode_req = 335741038L; +const SLONG gds_gfix_opt_SQL_dialect = 335741039L; +const SLONG gds_dsql_dbkey_from_non_table = 336003074L; +const SLONG gds_dsql_transitional_numeric = 336003075L; +const SLONG gds_dsql_dialect_warning_expr = 336003076L; +const SLONG gds_sql_db_dialect_dtype_unsupport = 336003077L; +const SLONG gds_isc_sql_dialect_conflict_num = 336003079L; +const SLONG gds_dsql_warning_number_ambiguous = 336003080L; +const SLONG gds_dsql_warning_number_ambiguous1 = 336003081L; +const SLONG gds_dsql_warn_precision_ambiguous = 336003082L; +const SLONG gds_dsql_warn_precision_ambiguous1 = 336003083L; +const SLONG gds_dsql_warn_precision_ambiguous2 = 336003084L; +const SLONG gds_dsql_ambiguous_field_name = 336003085L; +const SLONG gds_dsql_udf_return_pos_err = 336003086L; +const SLONG gds_dyn_role_does_not_exist = 336068796L; +const SLONG gds_dyn_no_grant_admin_opt = 336068797L; +const SLONG gds_dyn_user_not_role_member = 336068798L; +const SLONG gds_dyn_delete_role_failed = 336068799L; +const SLONG gds_dyn_grant_role_to_user = 336068800L; +const SLONG gds_dyn_inv_sql_role_name = 336068801L; +const SLONG gds_dyn_dup_sql_role = 336068802L; +const SLONG gds_dyn_kywd_spec_for_role = 336068803L; +const SLONG gds_dyn_roles_not_supported = 336068804L; +const SLONG gds_dyn_domain_name_exists = 336068812L; +const SLONG gds_dyn_field_name_exists = 336068813L; +const SLONG gds_dyn_dependency_exists = 336068814L; +const SLONG gds_dyn_dtype_invalid = 336068815L; +const SLONG gds_dyn_char_fld_too_small = 336068816L; +const SLONG gds_dyn_invalid_dtype_conversion = 336068817L; +const SLONG gds_dyn_dtype_conv_invalid = 336068818L; +const SLONG gds_dyn_zero_len_id = 336068820L; +const SLONG gds_gbak_unknown_switch = 336330753L; +const SLONG gds_gbak_page_size_missing = 336330754L; +const SLONG gds_gbak_page_size_toobig = 336330755L; +const SLONG gds_gbak_redir_ouput_missing = 336330756L; +const SLONG gds_gbak_switches_conflict = 336330757L; +const SLONG gds_gbak_unknown_device = 336330758L; +const SLONG gds_gbak_no_protection = 336330759L; +const SLONG gds_gbak_page_size_not_allowed = 336330760L; +const SLONG gds_gbak_multi_source_dest = 336330761L; +const SLONG gds_gbak_filename_missing = 336330762L; +const SLONG gds_gbak_dup_inout_names = 336330763L; +const SLONG gds_gbak_inv_page_size = 336330764L; +const SLONG gds_gbak_db_specified = 336330765L; +const SLONG gds_gbak_db_exists = 336330766L; +const SLONG gds_gbak_unk_device = 336330767L; +const SLONG gds_gbak_blob_info_failed = 336330772L; +const SLONG gds_gbak_unk_blob_item = 336330773L; +const SLONG gds_gbak_get_seg_failed = 336330774L; +const SLONG gds_gbak_close_blob_failed = 336330775L; +const SLONG gds_gbak_open_blob_failed = 336330776L; +const SLONG gds_gbak_put_blr_gen_id_failed = 336330777L; +const SLONG gds_gbak_unk_type = 336330778L; +const SLONG gds_gbak_comp_req_failed = 336330779L; +const SLONG gds_gbak_start_req_failed = 336330780L; +const SLONG gds_gbak_rec_failed = 336330781L; +const SLONG gds_gbak_rel_req_failed = 336330782L; +const SLONG gds_gbak_db_info_failed = 336330783L; +const SLONG gds_gbak_no_db_desc = 336330784L; +const SLONG gds_gbak_db_create_failed = 336330785L; +const SLONG gds_gbak_decomp_len_error = 336330786L; +const SLONG gds_gbak_tbl_missing = 336330787L; +const SLONG gds_gbak_blob_col_missing = 336330788L; +const SLONG gds_gbak_create_blob_failed = 336330789L; +const SLONG gds_gbak_put_seg_failed = 336330790L; +const SLONG gds_gbak_rec_len_exp = 336330791L; +const SLONG gds_gbak_inv_rec_len = 336330792L; +const SLONG gds_gbak_exp_data_type = 336330793L; +const SLONG gds_gbak_gen_id_failed = 336330794L; +const SLONG gds_gbak_unk_rec_type = 336330795L; +const SLONG gds_gbak_inv_bkup_ver = 336330796L; +const SLONG gds_gbak_missing_bkup_desc = 336330797L; +const SLONG gds_gbak_string_trunc = 336330798L; +const SLONG gds_gbak_cant_rest_record = 336330799L; +const SLONG gds_gbak_send_failed = 336330800L; +const SLONG gds_gbak_no_tbl_name = 336330801L; +const SLONG gds_gbak_unexp_eof = 336330802L; +const SLONG gds_gbak_db_format_too_old = 336330803L; +const SLONG gds_gbak_inv_array_dim = 336330804L; +const SLONG gds_gbak_xdr_len_expected = 336330807L; +const SLONG gds_gbak_open_bkup_error = 336330817L; +const SLONG gds_gbak_open_error = 336330818L; +const SLONG gds_gbak_missing_block_fac = 336330934L; +const SLONG gds_gbak_inv_block_fac = 336330935L; +const SLONG gds_gbak_block_fac_specified = 336330936L; +const SLONG gds_gbak_missing_username = 336330940L; +const SLONG gds_gbak_missing_password = 336330941L; +const SLONG gds_gbak_missing_skipped_bytes = 336330952L; +const SLONG gds_gbak_inv_skipped_bytes = 336330953L; +const SLONG gds_gbak_err_restore_charset = 336330965L; +const SLONG gds_gbak_err_restore_collation = 336330967L; +const SLONG gds_gbak_read_error = 336330972L; +const SLONG gds_gbak_write_error = 336330973L; +const SLONG gds_gbak_db_in_use = 336330985L; +const SLONG gds_gbak_sysmemex = 336330990L; +const SLONG gds_gbak_restore_role_failed = 336331002L; +const SLONG gds_gbak_role_op_missing = 336331005L; +const SLONG gds_gbak_page_buffers_missing = 336331010L; +const SLONG gds_gbak_page_buffers_wrong_param = 336331011L; +const SLONG gds_gbak_page_buffers_restore = 336331012L; +const SLONG gds_gbak_inv_size = 336331014L; +const SLONG gds_gbak_file_outof_sequence = 336331015L; +const SLONG gds_gbak_join_file_missing = 336331016L; +const SLONG gds_gbak_stdin_not_supptd = 336331017L; +const SLONG gds_gbak_stdout_not_supptd = 336331018L; +const SLONG gds_gbak_bkup_corrupt = 336331019L; +const SLONG gds_gbak_unk_db_file_spec = 336331020L; +const SLONG gds_gbak_hdr_write_failed = 336331021L; +const SLONG gds_gbak_disk_space_ex = 336331022L; +const SLONG gds_gbak_size_lt_min = 336331023L; +const SLONG gds_gbak_svc_name_missing = 336331025L; +const SLONG gds_gbak_not_ownr = 336331026L; +const SLONG gds_gbak_mode_req = 336331031L; +const SLONG gds_gbak_just_data = 336331033L; +const SLONG gds_gbak_data_only = 336331034L; +const SLONG gds_gsec_cant_open_db = 336723983L; +const SLONG gds_gsec_switches_error = 336723984L; +const SLONG gds_gsec_no_op_spec = 336723985L; +const SLONG gds_gsec_no_usr_name = 336723986L; +const SLONG gds_gsec_err_add = 336723987L; +const SLONG gds_gsec_err_modify = 336723988L; +const SLONG gds_gsec_err_find_mod = 336723989L; +const SLONG gds_gsec_err_rec_not_found = 336723990L; +const SLONG gds_gsec_err_delete = 336723991L; +const SLONG gds_gsec_err_find_del = 336723992L; +const SLONG gds_gsec_err_find_disp = 336723996L; +const SLONG gds_gsec_inv_param = 336723997L; +const SLONG gds_gsec_op_specified = 336723998L; +const SLONG gds_gsec_pw_specified = 336723999L; +const SLONG gds_gsec_uid_specified = 336724000L; +const SLONG gds_gsec_gid_specified = 336724001L; +const SLONG gds_gsec_proj_specified = 336724002L; +const SLONG gds_gsec_org_specified = 336724003L; +const SLONG gds_gsec_fname_specified = 336724004L; +const SLONG gds_gsec_mname_specified = 336724005L; +const SLONG gds_gsec_lname_specified = 336724006L; +const SLONG gds_gsec_inv_switch = 336724008L; +const SLONG gds_gsec_amb_switch = 336724009L; +const SLONG gds_gsec_no_op_specified = 336724010L; +const SLONG gds_gsec_params_not_allowed = 336724011L; +const SLONG gds_gsec_incompat_switch = 336724012L; +const SLONG gds_gsec_inv_username = 336724044L; +const SLONG gds_gsec_inv_pw_length = 336724045L; +const SLONG gds_gsec_db_specified = 336724046L; +const SLONG gds_gsec_db_admin_specified = 336724047L; +const SLONG gds_gsec_db_admin_pw_specified = 336724048L; +const SLONG gds_gsec_sql_role_specified = 336724049L; +const SLONG gds_license_no_file = 336789504L; +const SLONG gds_license_op_specified = 336789523L; +const SLONG gds_license_op_missing = 336789524L; +const SLONG gds_license_inv_switch = 336789525L; +const SLONG gds_license_inv_switch_combo = 336789526L; +const SLONG gds_license_inv_op_combo = 336789527L; +const SLONG gds_license_amb_switch = 336789528L; +const SLONG gds_license_inv_parameter = 336789529L; +const SLONG gds_license_param_specified = 336789530L; +const SLONG gds_license_param_req = 336789531L; +const SLONG gds_license_syntx_error = 336789532L; +const SLONG gds_license_dup_id = 336789534L; +const SLONG gds_license_inv_id_key = 336789535L; +const SLONG gds_license_err_remove = 336789536L; +const SLONG gds_license_err_update = 336789537L; +const SLONG gds_license_err_convert = 336789538L; +const SLONG gds_license_err_unk = 336789539L; +const SLONG gds_license_svc_err_add = 336789540L; +const SLONG gds_license_svc_err_remove = 336789541L; +const SLONG gds_license_eval_exists = 336789563L; +const SLONG gds_gstat_unknown_switch = 336920577L; +const SLONG gds_gstat_retry = 336920578L; +const SLONG gds_gstat_wrong_ods = 336920579L; +const SLONG gds_gstat_unexpected_eof = 336920580L; +const SLONG gds_gstat_open_err = 336920605L; +const SLONG gds_gstat_read_err = 336920606L; +const SLONG gds_gstat_sysmemex = 336920607L; +const SLONG gds_err_max = 700L; #else /* c definitions */ diff --git a/src/jrd/align.cpp b/src/jrd/align.cpp index 494d761e4c..3083d594e8 100644 --- a/src/jrd/align.cpp +++ b/src/jrd/align.cpp @@ -17,7 +17,7 @@ * Contributor(s): ______________________________________. */ /* -$Id: align.cpp,v 1.5 2002-09-17 05:58:35 eku Exp $ +$Id: align.cpp,v 1.6 2002-12-02 08:25:17 eku Exp $ */ #include "firebird.h" @@ -75,7 +75,7 @@ int main(argc, argv) #endif { double *p, d1; -#if (defined __osf__ && defined __alpha) +#if SIZEOF_LONG == 8 int vector[3]; #else long vector[3]; @@ -131,7 +131,7 @@ static int check_double() #endif { double *p, d1; -#if (defined __osf__ && defined __alpha) +#if SIZEOF_LONG == 8 int vector[3]; #else long vector[3]; diff --git a/src/jrd/codes.epp b/src/jrd/codes.epp index a72f4d95b3..68daba25e0 100644 --- a/src/jrd/codes.epp +++ b/src/jrd/codes.epp @@ -132,31 +132,31 @@ static CONST SCHAR *c_boiler_plate[] = { }; static CONST SCHAR *cpp_boiler_plate[] = { - "const GDS_LONG gds_arg_end = 0; /* end of argument list */", - "const GDS_LONG gds_arg_gds = 1; /* generic DSRI status value */", - "const GDS_LONG gds_arg_string = 2; /* string argument */", - "const GDS_LONG gds_arg_cstring = 3; /* count & string argument */", - "const GDS_LONG gds_arg_number = 4; /* numeric argument (long) */", - "const GDS_LONG gds_arg_interpreted = 5; /* interpreted status code (string) */", - "const GDS_LONG gds_arg_vms = 6; /* VAX/VMS status code (long) */", - "const GDS_LONG gds_arg_unix = 7; /* UNIX error code */", - "const GDS_LONG gds_arg_domain = 8; /* Apollo/Domain error code */", - "const GDS_LONG gds_arg_dos = 9; /* MSDOS/OS2 error code */", - "const GDS_LONG gds_arg_mpexl = 10; /* HP MPE/XL error code */", - "const GDS_LONG gds_arg_mpexl_ipc = 11; /* HP MPE/XL IPC error code */", + "const SLONG gds_arg_end = 0; /* end of argument list */", + "const SLONG gds_arg_gds = 1; /* generic DSRI status value */", + "const SLONG gds_arg_string = 2; /* string argument */", + "const SLONG gds_arg_cstring = 3; /* count & string argument */", + "const SLONG gds_arg_number = 4; /* numeric argument (long) */", + "const SLONG gds_arg_interpreted = 5; /* interpreted status code (string) */", + "const SLONG gds_arg_vms = 6; /* VAX/VMS status code (long) */", + "const SLONG gds_arg_unix = 7; /* UNIX error code */", + "const SLONG gds_arg_domain = 8; /* Apollo/Domain error code */", + "const SLONG gds_arg_dos = 9; /* MSDOS/OS2 error code */", + "const SLONG gds_arg_mpexl = 10; /* HP MPE/XL error code */", + "const SLONG gds_arg_mpexl_ipc = 11; /* HP MPE/XL IPC error code */", #ifdef dontdothis /* #'s 12-14 WERE USED BY TWIN SUN AND THUS MUST BE SKIPPED BY US! */ - "const GDS_LONG gds_arg_string2 = 12; /* string argument */", - "const GDS_LONG gds_arg_cstring2 = 13; /* count & string argument */", - "const GDS_LONG gds_arg_interpreted2 = 14; /* interpreted status code (string) */" + "const SLONG gds_arg_string2 = 12; /* string argument */", + "const SLONG gds_arg_cstring2 = 13; /* count & string argument */", + "const SLONG gds_arg_interpreted2 = 14; /* interpreted status code (string) */" #endif - "const GDS_LONG gds_arg_next_mach = 15; /* NeXT/Mach error code */", - "const GDS_LONG gds_arg_netware = 16; /* NetWare error code */", - "const GDS_LONG gds_arg_win32 = 17; /* Win32 error code */", - "const GDS_LONG gds_arg_warning = 18; /* warning argument */", + "const SLONG gds_arg_next_mach = 15; /* NeXT/Mach error code */", + "const SLONG gds_arg_netware = 16; /* NetWare error code */", + "const SLONG gds_arg_win32 = 17; /* Win32 error code */", + "const SLONG gds_arg_warning = 18; /* warning argument */", "", }; @@ -441,7 +441,7 @@ static void build_codes_h(void) ib_fprintf(c_codes, "\n#ifdef __cplusplus /* c++ definitions */\n\n"); ib_fprintf(c_codes, - "const GDS_LONG gds_facility = %d;\nconst GDS_LONG gds_err_base = %ldL;\nconst GDS_LONG gds_err_factor = %ld;\n", + "const SLONG gds_facility = %d;\nconst SLONG gds_err_base = %ldL;\nconst SLONG gds_err_factor = %ld;\n", gds_facility, (SLONG) gds_base, (SLONG) gds_factor); /* Append the C++ boiler plate */ @@ -463,7 +463,7 @@ static void build_codes_h(void) last_code = N.CODE; new_code = ENCODE_ISC_MSG(S.NUMBER, N.FAC_CODE); - ib_fprintf(c_codes, "const GDS_LONG gds_%-32.32s = %dL;\n", S.GDS_SYMBOL, + ib_fprintf(c_codes, "const SLONG gds_%-32.32s = %dL;\n", S.GDS_SYMBOL, new_code); ++code; @@ -500,7 +500,7 @@ static void build_codes_h(void) END_FOR; --code; - ib_fprintf(c_codes, "const GDS_LONG gds_%-32.32s = %dL;\n", "err_max", code); + ib_fprintf(c_codes, "const SLONG gds_%-32.32s = %dL;\n", "err_max", code); ib_fprintf(c_codes, "\n"); diff --git a/src/jrd/gdsold.h b/src/jrd/gdsold.h index 242fe1ee23..4be479e6d3 100644 --- a/src/jrd/gdsold.h +++ b/src/jrd/gdsold.h @@ -39,8 +39,6 @@ #define GDS_REF(val) &val #endif -#define GDS_TYPE GDS_STATUS - #define CANCEL_disable 1 #define CANCEL_enable 2 #define CANCEL_raise 3 @@ -50,7 +48,7 @@ /******************************************************************/ #ifndef GDS_FAR -#define GDS_FAR +#define GDS_FAR #endif @@ -62,7 +60,7 @@ typedef void GDS_FAR *gds_win_handle; typedef void GDS_FAR *gds_form_handle; typedef void GDS_FAR *gds_stmt_handle; typedef void GDS_FAR *gds_svc_handle; -typedef void (GDS_FAR * gds_callback) (); +typedef void (GDS_FAR * gds_callback)(); /*************************/ @@ -85,48 +83,48 @@ typedef GDS_QUAD GDS__QUAD; defined(__cplusplus) -GDS_STATUS GDS_EXPORT gds__attach_database(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__attach_database(STATUS GDS_FAR *, short, char GDS_FAR *, void GDS_FAR * GDS_FAR *, short, char GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__blob_info(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__blob_info(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, short, char GDS_FAR *, short, char GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__cancel_blob(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__cancel_blob(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__close_blob(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__close_blob(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__commit_transaction(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__commit_transaction(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__compile_request(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__compile_request(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, void GDS_FAR * GDS_FAR *, short, char GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__compile_request2(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__compile_request2(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, void GDS_FAR * GDS_FAR *, short, char GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__create_blob(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__create_blob(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, void GDS_FAR * GDS_FAR *, void GDS_FAR * GDS_FAR *, GDS__QUAD GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__create_blob2(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__create_blob2(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, void GDS_FAR * GDS_FAR *, void GDS_FAR * GDS_FAR *, @@ -134,7 +132,7 @@ GDS_STATUS GDS_EXPORT gds__create_blob2(GDS_STATUS GDS_FAR *, short, char GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__create_database(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__create_database(STATUS GDS_FAR *, short, char GDS_FAR *, void GDS_FAR * GDS_FAR *, @@ -142,7 +140,7 @@ GDS_STATUS GDS_EXPORT gds__create_database(GDS_STATUS GDS_FAR *, char GDS_FAR *, short); -GDS_STATUS GDS_EXPORT gds__database_info(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__database_info(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, short, char GDS_FAR *, @@ -152,24 +150,24 @@ GDS_STATUS GDS_EXPORT gds__database_info(GDS_STATUS GDS_FAR *, void GDS_EXPORT gds__decode_date(GDS__QUAD GDS_FAR *, void GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__detach_database(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__detach_database(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *); -GDS_ULONG GDS_EXPORT gds__free(void GDS_FAR *); +ULONG GDS_EXPORT gds__free(void GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__get_segment(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__get_segment(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, unsigned short GDS_FAR *, unsigned short, char GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__open_blob(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__open_blob(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, void GDS_FAR * GDS_FAR *, void GDS_FAR * GDS_FAR *, GDS__QUAD GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__open_blob2(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__open_blob2(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, void GDS_FAR * GDS_FAR *, void GDS_FAR * GDS_FAR *, @@ -177,33 +175,33 @@ GDS_STATUS GDS_EXPORT gds__open_blob2(GDS_STATUS GDS_FAR *, short, char GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__prepare_transaction(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__prepare_transaction(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__prepare_transaction2(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__prepare_transaction2(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, short, char GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__put_segment(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__put_segment(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, unsigned short, char GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__receive(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__receive(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, short, short, void GDS_FAR *, short); -GDS_STATUS GDS_EXPORT gds__reconnect_transaction(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__reconnect_transaction(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, void GDS_FAR * GDS_FAR *, short, char GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__request_info(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__request_info(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, short, short, @@ -211,19 +209,19 @@ GDS_STATUS GDS_EXPORT gds__request_info(GDS_STATUS GDS_FAR *, short, char GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__release_request(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__release_request(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__rollback_transaction(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__rollback_transaction(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__seek_blob(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__seek_blob(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, short, - GDS_LONG, - GDS_LONG GDS_FAR *); + SLONG, + SLONG GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__send(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__send(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, short, short, @@ -232,7 +230,7 @@ GDS_STATUS GDS_EXPORT gds__send(GDS_STATUS GDS_FAR *, void GDS_EXPORT gds__set_debug(int); -GDS_STATUS GDS_EXPORT gds__start_and_send(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__start_and_send(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, void GDS_FAR * GDS_FAR *, short, @@ -240,32 +238,32 @@ GDS_STATUS GDS_EXPORT gds__start_and_send(GDS_STATUS GDS_FAR *, void GDS_FAR *, short); -GDS_STATUS GDS_EXPORT gds__start_multiple(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__start_multiple(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, short, void GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__start_request(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__start_request(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, void GDS_FAR * GDS_FAR *, short); -GDS_STATUS GDS_EXPORT gds__start_transaction(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__start_transaction(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, short, ...); -GDS_STATUS GDS_EXPORT gds__transaction_info(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__transaction_info(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, short, char GDS_FAR *, short, char GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__unwind_request(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__unwind_request(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, short); -GDS_LONG GDS_EXPORT gds__ftof(char GDS_FAR *, +SLONG GDS_EXPORT gds__ftof(char GDS_FAR *, unsigned short, char GDS_FAR *, unsigned short); @@ -280,35 +278,35 @@ int GDS_EXPORT gds__disable_subsystem(char GDS_FAR *); int GDS_EXPORT gds__enable_subsystem(char GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__print_status(GDS_STATUS GDS_FAR *); +STATUS GDS_EXPORT gds__print_status(STATUS GDS_FAR *); -GDS_LONG GDS_EXPORT gds__sqlcode(GDS_STATUS GDS_FAR *); +SLONG GDS_EXPORT gds__sqlcode(STATUS GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__ddl(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__ddl(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, void GDS_FAR * GDS_FAR *, short, char GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__commit_retaining(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__commit_retaining(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *); void GDS_EXPORT gds__encode_date(void GDS_FAR *, GDS__QUAD GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__que_events(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__que_events(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, - GDS_LONG GDS_FAR *, + SLONG GDS_FAR *, short, char GDS_FAR *, void (GDS_FAR *) (), void GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__cancel_events(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__cancel_events(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, - GDS_LONG GDS_FAR *); + SLONG GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__event_wait(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__event_wait(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, short, char GDS_FAR *, @@ -319,31 +317,31 @@ void GDS_EXPORT gds__event_counts(ULONG GDS_FAR *, char GDS_FAR *, char GDS_FAR *); -GDS_LONG GDS_EXPORT gds__event_block(char GDS_FAR * GDS_FAR *, +SLONG GDS_EXPORT gds__event_block(char GDS_FAR * GDS_FAR *, char GDS_FAR * GDS_FAR *, unsigned short, ...); -GDS_STATUS GDS_EXPORT gds__get_slice(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__get_slice(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, void GDS_FAR * GDS_FAR *, GDS__QUAD GDS_FAR *, short, char GDS_FAR *, short, - GDS_LONG GDS_FAR *, - GDS_LONG, + SLONG GDS_FAR *, + SLONG, void GDS_FAR *, - GDS_LONG GDS_FAR *); + SLONG GDS_FAR *); -GDS_STATUS GDS_EXPORT gds__put_slice(GDS_STATUS GDS_FAR *, +STATUS GDS_EXPORT gds__put_slice(STATUS GDS_FAR *, void GDS_FAR * GDS_FAR *, void GDS_FAR * GDS_FAR *, GDS__QUAD GDS_FAR *, short, char GDS_FAR *, short, - GDS_LONG GDS_FAR *, - GDS_LONG, + SLONG GDS_FAR *, + SLONG, void GDS_FAR *); void GDS_EXPORT gds__vtof(char GDS_FAR *, @@ -356,49 +354,49 @@ void GDS_EXPORT gds__vtof(char GDS_FAR *, #ifndef _Windows #ifndef _WINDOWS -GDS_TYPE GDS_EXPORT gds__attach_database(); -GDS_TYPE GDS_EXPORT gds__blob_info(); -GDS_TYPE GDS_EXPORT gds__cancel_blob(); -GDS_TYPE GDS_EXPORT gds__close_blob(); -GDS_TYPE GDS_EXPORT gds__commit_transaction(); -GDS_TYPE GDS_EXPORT gds__compile_request(); -GDS_TYPE GDS_EXPORT gds__compile_request2(); -GDS_TYPE GDS_EXPORT gds__create_blob(); -GDS_TYPE GDS_EXPORT gds__create_blob2(); -GDS_TYPE GDS_EXPORT gds__create_database(); -GDS_TYPE GDS_EXPORT gds__database_info(); -GDS_TYPE GDS_EXPORT gds__detach_database(); -GDS_TYPE GDS_EXPORT gds__get_segment(); -GDS_TYPE GDS_EXPORT gds__open_blob(); -GDS_TYPE GDS_EXPORT gds__open_blob2(); -GDS_TYPE GDS_EXPORT gds__prepare_transaction(); -GDS_TYPE GDS_EXPORT gds__prepare_transaction2(); -GDS_TYPE GDS_EXPORT gds__put_segment(); -GDS_TYPE GDS_EXPORT gds__receive(); -GDS_TYPE GDS_EXPORT gds__reconnect_transaction(); -GDS_TYPE GDS_EXPORT gds__request_info(); -GDS_TYPE GDS_EXPORT gds__release_request(); -GDS_TYPE GDS_EXPORT gds__rollback_transaction(); -GDS_TYPE GDS_EXPORT gds__seek_blob(); -GDS_TYPE GDS_EXPORT gds__send(); -GDS_TYPE GDS_EXPORT gds__start_and_send(); -GDS_TYPE GDS_EXPORT gds__start_multiple(); -GDS_TYPE GDS_EXPORT gds__start_request(); -GDS_TYPE GDS_EXPORT gds__start_transaction(); -GDS_TYPE GDS_EXPORT gds__transaction_info(); -GDS_TYPE GDS_EXPORT gds__unwind_request(); -GDS_TYPE GDS_EXPORT gds__ftof(); -GDS_TYPE GDS_EXPORT gds__print_status(); -GDS_TYPE GDS_EXPORT gds__sqlcode(); -GDS_TYPE GDS_EXPORT gds__ddl(); -GDS_TYPE GDS_EXPORT gds__commit_retaining(); -GDS_TYPE GDS_EXPORT gds__que_events(); -GDS_TYPE GDS_EXPORT gds__cancel_events(); -GDS_TYPE GDS_EXPORT gds__event_wait(); -GDS_TYPE GDS_EXPORT gds__event_block(); -GDS_TYPE GDS_EXPORT gds__get_slice(); -GDS_TYPE GDS_EXPORT gds__put_slice(); -GDS_TYPE GDS_EXPORT gds__seek_blob(); +STATUS GDS_EXPORT gds__attach_database(); +STATUS GDS_EXPORT gds__blob_info(); +STATUS GDS_EXPORT gds__cancel_blob(); +STATUS GDS_EXPORT gds__close_blob(); +STATUS GDS_EXPORT gds__commit_transaction(); +STATUS GDS_EXPORT gds__compile_request(); +STATUS GDS_EXPORT gds__compile_request2(); +STATUS GDS_EXPORT gds__create_blob(); +STATUS GDS_EXPORT gds__create_blob2(); +STATUS GDS_EXPORT gds__create_database(); +STATUS GDS_EXPORT gds__database_info(); +STATUS GDS_EXPORT gds__detach_database(); +STATUS GDS_EXPORT gds__get_segment(); +STATUS GDS_EXPORT gds__open_blob(); +STATUS GDS_EXPORT gds__open_blob2(); +STATUS GDS_EXPORT gds__prepare_transaction(); +STATUS GDS_EXPORT gds__prepare_transaction2(); +STATUS GDS_EXPORT gds__put_segment(); +STATUS GDS_EXPORT gds__receive(); +STATUS GDS_EXPORT gds__reconnect_transaction(); +STATUS GDS_EXPORT gds__request_info(); +STATUS GDS_EXPORT gds__release_request(); +STATUS GDS_EXPORT gds__rollback_transaction(); +STATUS GDS_EXPORT gds__seek_blob(); +STATUS GDS_EXPORT gds__send(); +STATUS GDS_EXPORT gds__start_and_send(); +STATUS GDS_EXPORT gds__start_multiple(); +STATUS GDS_EXPORT gds__start_request(); +STATUS GDS_EXPORT gds__start_transaction(); +STATUS GDS_EXPORT gds__transaction_info(); +STATUS GDS_EXPORT gds__unwind_request(); +STATUS GDS_EXPORT gds__ftof(); +STATUS GDS_EXPORT gds__print_status(); +STATUS GDS_EXPORT gds__sqlcode(); +STATUS GDS_EXPORT gds__ddl(); +STATUS GDS_EXPORT gds__commit_retaining(); +STATUS GDS_EXPORT gds__que_events(); +STATUS GDS_EXPORT gds__cancel_events(); +STATUS GDS_EXPORT gds__event_wait(); +STATUS GDS_EXPORT gds__event_block(); +STATUS GDS_EXPORT gds__get_slice(); +STATUS GDS_EXPORT gds__put_slice(); +STATUS GDS_EXPORT gds__seek_blob(); void GDS_EXPORT gds__event_counts(); void GDS_EXPORT gds__set_debug(); diff --git a/src/jrd/ibase.h b/src/jrd/ibase.h index 773744b529..e43470c2ee 100644 --- a/src/jrd/ibase.h +++ b/src/jrd/ibase.h @@ -33,7 +33,7 @@ * */ /* -$Id: ibase.h,v 1.17 2002-11-17 16:21:41 dimitr Exp $ +$Id: ibase.h,v 1.18 2002-12-02 08:25:17 eku Exp $ */ #ifndef JRD_IBASE_H @@ -51,7 +51,7 @@ $Id: ibase.h,v 1.17 2002-11-17 16:21:41 dimitr Exp $ #define ISC__FALSE ISC_FALSE #endif -#if (defined __osf__ && defined __alpha) +#if SIZEOF_LONG == 8 #define ISC_LONG int #define ISC_ULONG unsigned int #else diff --git a/src/jrd/intl.cpp b/src/jrd/intl.cpp index 578baed30b..444f4c3993 100644 --- a/src/jrd/intl.cpp +++ b/src/jrd/intl.cpp @@ -187,8 +187,6 @@ static void* intl_back_compat_alloc_func_lookup(USHORT, CHARSET_ID, CHARSET_ID); static void* intl_back_compat_obj_init_lookup(USHORT, SSHORT, SSHORT); -#define NUM_ELEMENTS(x) (sizeof ((x))/sizeof ((x)[0])) - /* Name of module that implements text-type (n) */ #ifdef VMS diff --git a/src/jrd/sym.cpp b/src/jrd/sym.cpp index f603b1f465..45b429baa5 100644 --- a/src/jrd/sym.cpp +++ b/src/jrd/sym.cpp @@ -29,8 +29,6 @@ #include "../jrd/sym_proto.h" #include "../jrd/thd_proto.h" -#define NUMWORDS (sizeof (keywords) / sizeof (struct word)) - extern "C" { diff --git a/src/lock/lock.cpp b/src/lock/lock.cpp index 950006d3ce..7fcabd9860 100644 --- a/src/lock/lock.cpp +++ b/src/lock/lock.cpp @@ -29,7 +29,7 @@ * */ /* -$Id: lock.cpp,v 1.24 2002-11-14 08:25:29 dimitr Exp $ +$Id: lock.cpp,v 1.25 2002-12-02 08:25:18 eku Exp $ */ #include "firebird.h" @@ -341,7 +341,7 @@ static struct ipccfg LOCK_hdrtbl[] = #define OWN_BLOCK_dummy 3 #ifndef LOCK_MANAGER -#define LOCK_MANAGER "bin/gds_lock_mgr" +#define LOCK_MANAGER "bin/fb_lock_mgr" #endif diff --git a/src/make.new/config/config.h.in b/src/make.new/config/config.h.in index 8513158224..46368f6714 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.61 2002-11-21 08:56:28 eku Exp $" +#ident "$Id: config.h.in,v 1.62 2002-12-02 08:25:18 eku Exp $" /* * 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete ports: @@ -108,6 +108,7 @@ /* sizeof(void *) = 8 ==> HAS_64BIT_POINTERS */ #define SIZEOF_VOID_P 4 +#define SIZEOF_LONG 4 /* Is union semun defined? */ #undef HAVE_SEMUN diff --git a/src/qli/hsh.cpp b/src/qli/hsh.cpp index 3184ca285e..b22d96f35f 100644 --- a/src/qli/hsh.cpp +++ b/src/qli/hsh.cpp @@ -48,8 +48,6 @@ struct word { {KW_continuation, "-\n"} }; -#define NUMWORDS (sizeof (keywords) / sizeof (struct word)) - void HSH_fini(void) { @@ -89,10 +87,10 @@ void HSH_init(void) **************************************/ register SCHAR *string; register SYM symbol; - register SSHORT i; + register int i; struct word *word; - for (i = 0, word = keywords; i < (SSHORT)NUMWORDS; i++, word++) { + for (i = 0, word = keywords; i < FB_NELEM(keywords); i++, word++) { for (string = word->keyword; *string; string++); symbol = (SYM) ALLOCPV(type_sym, 0); symbol->sym_type = SYM_keyword; diff --git a/src/utilities/create_db.cpp b/src/utilities/create_db.cpp index 972eb18de8..ee31198e6a 100644 --- a/src/utilities/create_db.cpp +++ b/src/utilities/create_db.cpp @@ -17,12 +17,12 @@ int main(int argc, char **argv) printf("Usage: %s \n", argv[0]); return -1; } - + d = dpb; *d++ = (UCHAR) isc_dpb_version1; *d++ = (UCHAR) isc_dpb_set_db_readonly; *d++ = 1; - *d++ = GDS_TRUE; + *d++ = TRUE; len = d - dpb; isc_create_database(sv, 0, argv[1], &db, 0, 0, 0);