Menu
▾
▴
[Firebird-checkins] CVS: firebird2/src/jrd tra.h,1.28,1.29 shut.cpp,1.22,1.23 ods.h,1.21,1.22 obj.h,1.3,1.4 nbak.cpp,1.29,1.30 nav.cpp,1.38,1.39 met.epp,1.113,1.114 intlobj.h,1.21,1.22 intl_classes.h,1.17,1.18 ini.h,1.14,1.15 ini.epp,1.44,1.45 ibase.h,1.72,1.73 fun.epp,1.49,1.50 evl.cpp,1.80,1.81 dyn_def.epp,1.64,1.65 dsc2.h,1.3,1.4 dsc.cpp,1.18,1.19 dpm.epp,1.44,1.45 dfw.epp,1.102,1.103 dbg.cpp,1.24,1.25 cvt2.cpp,1.30,1.31 cmp.cpp,1.115,1.116 blob_filter.cpp,1.26,1.27 blb.cpp,1.71,1.72
Build Version : T2.0.0.7218 Firebird 2.0 UNSTABLE (writeBuildNum.sh,v 1.7220 2004/04/30 22:45:41 brodsom Exp ) Update of /cvsroot/firebird/firebird2/src/jrd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27162/jrd Modified Files: tra.h shut.cpp ods.h obj.h nbak.cpp nav.cpp met.epp intlobj.h intl_classes.h ini.h ini.epp ibase.h fun.epp evl.cpp dyn_def.epp dsc2.h dsc.cpp dpm.epp dfw.epp dbg.cpp cvt2.cpp cmp.cpp blob_filter.cpp blb.cpp Log Message: - Split sqlda.h to avoid duplicated definitions between ibase.h and sqlda.h - Replace define for constants - Remove contants.h where not used. Index: tra.h =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/tra.h,v retrieving revision 1.28 retrieving revision 1.29 diff -b -U3 -r1.28 -r1.29 --- tra.h 18 Apr 2004 02:50:38 -0000 1.28 +++ tra.h 30 Apr 2004 22:45:38 -0000 1.29 @@ -86,35 +86,35 @@ UCHAR tra_transactions[1]; }; -#define TRA_system 1L /* system transaction */ -#define TRA_update 2L /* update is permitted */ -#define TRA_prepared 4L /* transaction is in limbo */ -#define TRA_reconnected 8L /* reconnect in progress */ -#define TRA_reserving 16L /* relations explicityly locked */ -#define TRA_degree3 32L /* serializeable transaction */ -#define TRA_committing 64L /* commit in progress */ -#define TRA_write 128L /* transaction has written */ -#define TRA_readonly 256L /* transaction is readonly */ -#define TRA_nowait 512L /* don't wait on relations, give up */ -#define TRA_prepare2 1024L /* transaction has updated RDB$TRANSACTIONS */ -#define TRA_ignore_limbo 2048L /* ignore transactions in limbo */ -#define TRA_invalidated 4096L /* transaction invalidated by failed write */ -#define TRA_deferred_meta 8192L /* deferred meta work posted */ -//#define TRA_add_log 16384L /* write ahead log file was added */ -//#define TRA_delete_log 32768L /* write ahead log file was deleted */ -#define TRA_read_committed 65536L /* can see latest committed records */ -#define TRA_autocommit 131072L /* autocommits all updates */ -#define TRA_perform_autocommit 262144L /* indicates autocommit is necessary */ -#define TRA_rec_version 524288L /* don't wait for uncommitted versions */ -#define TRA_restart_requests 1048576L /* restart all requests in attachment */ -#define TRA_no_auto_undo 2097152L /* don't start a savepoint in TRA_start */ -#define TRA_sweep_at_startup 4194304L /* sweep done at startup */ -#define TRA_precommitted 8388608L /* transaction committed at startup */ - -#define TRA_MASK 3 -#define TRA_BITS_PER_TRANS 2 -#define TRA_TRANS_PER_BYTE 4 -#define TRA_SHIFT 2 +const ULONG TRA_system = 1L; /* system transaction */ +const ULONG TRA_update = 2L; /* update is permitted */ +const ULONG TRA_prepared = 4L; /* transaction is in limbo */ +const ULONG TRA_reconnected = 8L; /* reconnect in progress */ +const ULONG TRA_reserving = 16L; /* relations explicityly locked */ +const ULONG TRA_degree3 = 32L; /* serializeable transaction */ +const ULONG TRA_committing = 64L; /* commit in progress */ +const ULONG TRA_write = 128L; /* transaction has written */ +const ULONG TRA_readonly = 256L; /* transaction is readonly */ +const ULONG TRA_nowait = 512L; /* don't wait on relations, give up */ +const ULONG TRA_prepare2 = 1024L; /* transaction has updated RDB$TRANSACTIONS */ +const ULONG TRA_ignore_limbo = 2048L; /* ignore transactions in limbo */ +const ULONG TRA_invalidated = 4096L; /* transaction invalidated by failed write */ +const ULONG TRA_deferred_meta = 8192L; /* deferred meta work posted */ +//const ULONG TRA_add_log = 16384L; /* write ahead log file was added */ +//const ULONG TRA_delete_log = 32768L; /* write ahead log file was deleted */ +const ULONG TRA_read_committed = 65536L; /* can see latest committed records */ +const ULONG TRA_autocommit = 131072L; /* autocommits all updates */ +const ULONG TRA_perform_autocommit = 262144L; /* indicates autocommit is necessary */ +const ULONG TRA_rec_version = 524288L; /* don't wait for uncommitted versions */ +const ULONG TRA_restart_requests = 1048576L; /* restart all requests in attachment */ +const ULONG TRA_no_auto_undo = 2097152L; /* don't start a savepoint in TRA_start */ +const ULONG TRA_sweep_at_startup = 4194304L; /* sweep done at startup */ +const ULONG TRA_precommitted = 8388608L; /* transaction committed at startup */ + +const int TRA_MASK = 3; +const int TRA_BITS_PER_TRANS = 2; +const int TRA_TRANS_PER_BYTE = 4; +const int TRA_SHIFT = 2; #define TRANS_SHIFT(number) (((number) & TRA_MASK) << 1) #define TRANS_OFFSET(number) ((number) >> TRA_SHIFT) @@ -123,18 +123,18 @@ for "dead" active transactions every so often at transaction startup */ -#define TRA_ACTIVE_CLEANUP 100 +const int TRA_ACTIVE_CLEANUP = 100; /* Transaction states. The first four are states found in the transaction inventory page; the last two are returned internally */ -#define tra_active 0 /* Transaction is active */ -#define tra_limbo 1 -#define tra_dead 2 -#define tra_committed 3 -#define tra_us 4 /* Transaction is us */ -#define tra_precommitted 5 /* Transaction is precommitted */ +const int tra_active = 0; /* Transaction is active */ +const int tra_limbo = 1; +const int tra_dead = 2; +const int tra_committed = 3; +const int tra_us = 4; /* Transaction is us */ +const int tra_precommitted = 5; /* Transaction is precommitted */ /* The highest transaction number possible. This is 0x7fffffff if SLONG is 32 bits. */ #define MAX_TRA_NUMBER (~(1L << (BITS_PER_LONG - 1))) @@ -153,11 +153,11 @@ /* Savepoint block flags. */ -#define SAV_trans_level 1 /* savepoint was started by TRA_start */ -#define SAV_event_post 2 /* event posted in the save point */ -#define SAV_user 4 /* named user savepoint as opposed to system ones */ +const int SAV_trans_level = 1; /* savepoint was started by TRA_start */ +const int SAV_event_post = 2; /* event posted in the save point */ +const int SAV_user = 4; /* named user savepoint as opposed to system ones */ -#define SAV_LARGE 500 /* Number of allocated record structs when transaction sweep +const int SAV_LARGE = 500; /* Number of allocated record structs when transaction sweep becomes preferred over transaction savepoint undo */ /* Deferred work blocks are used by the meta data handler to keep track Index: shut.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/shut.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -b -U3 -r1.22 -r1.23 --- shut.cpp 28 Mar 2004 09:10:15 -0000 1.22 +++ shut.cpp 30 Apr 2004 22:45:38 -0000 1.23 @@ -249,18 +249,18 @@ (Ods::header_page*) CCH_FETCH(tdbb, &window, LCK_write, pag_header); CCH_MARK_MUST_WRITE(tdbb, &window); // Set appropriate shutdown mode in database header - header->hdr_flags &= ~hdr_shutdown_mask; + header->hdr_flags &= ~Ods::hdr_shutdown_mask; switch(flag & isc_dpb_shut_mode_mask) { case isc_dpb_shut_normal: break; case isc_dpb_shut_multi: - header->hdr_flags |= hdr_shutdown_multi; + header->hdr_flags |= Ods::hdr_shutdown_multi; break; case isc_dpb_shut_single: - header->hdr_flags |= hdr_shutdown_single; + header->hdr_flags |= Ods::hdr_shutdown_single; break; case isc_dpb_shut_full: - header->hdr_flags |= hdr_shutdown_full; + header->hdr_flags |= Ods::hdr_shutdown_full; break; } CCH_RELEASE(tdbb, &window); @@ -358,18 +358,18 @@ Ods::header_page* header = (Ods::header_page*) CCH_FETCH(tdbb, &window, LCK_write, pag_header); CCH_MARK_MUST_WRITE(tdbb, &window); // Set appropriate shutdown mode in database header - header->hdr_flags &= ~hdr_shutdown_mask; + header->hdr_flags &= ~Ods::hdr_shutdown_mask; switch(shut_mode) { case isc_dpb_shut_normal: break; case isc_dpb_shut_multi: - header->hdr_flags |= hdr_shutdown_multi; + header->hdr_flags |= Ods::hdr_shutdown_multi; break; case isc_dpb_shut_single: - header->hdr_flags |= hdr_shutdown_single; + header->hdr_flags |= Ods::hdr_shutdown_single; break; case isc_dpb_shut_full: - header->hdr_flags |= hdr_shutdown_full; + header->hdr_flags |= Ods::hdr_shutdown_full; break; } CCH_RELEASE(tdbb, &window); Index: ods.h =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/ods.h,v retrieving revision 1.21 retrieving revision 1.22 diff -b -U3 -r1.21 -r1.22 --- ods.h 28 Mar 2004 09:10:15 -0000 1.21 +++ ods.h 30 Apr 2004 22:45:38 -0000 1.22 @@ -46,13 +46,13 @@ /* ODS major version -- major versions are not compatible */ -#define ODS_VERSION6 6 /* on-disk structure as of v3.0 */ -#define ODS_VERSION7 7 /* new on disk structure for fixing index bug */ -#define ODS_VERSION8 8 /* new btree structure to support pc semantics */ -#define ODS_VERSION9 9 /* btree leaf pages are always propogated up */ -#define ODS_VERSION10 10 /* V6.0 features. SQL delimited idetifier, +const int ODS_VERSION6 = 6; /* on-disk structure as of v3.0 */ +const int ODS_VERSION7 = 7; /* new on disk structure for fixing index bug */ +const int ODS_VERSION8 = 8; /* new btree structure to support pc semantics */ +const int ODS_VERSION9 = 9; /* btree leaf pages are always propogated up */ +const int ODS_VERSION10 = 10; /* V6.0 features. SQL delimited idetifier, SQLDATE, and 64-bit exact numeric type */ -#define ODS_VERSION11 11 /* Firebird 2.0 features */ +const int ODS_VERSION11 = 11; /* Firebird 2.0 features */ /* ODS minor version -- minor versions ARE compatible, but may be increasingly functional. Add new minor versions, but leave previous @@ -60,41 +60,41 @@ /* Minor versions for ODS 6 */ -#define ODS_GRANT6 1 /* adds fields for field level grant */ -#define ODS_INTEGRITY6 2 /* adds fields for referential integrity */ -#define ODS_FUNCTIONS6 3 /* modifies type of RDB$MODULE_NAME field */ -#define ODS_SQLNAMES6 4 /* permits SQL security on > 27 SCHAR names */ -#define ODS_CURRENT6 4 +const int ODS_GRANT6 = 1; /* adds fields for field level grant */ +const int ODS_INTEGRITY6 = 2; /* adds fields for referential integrity */ +const int ODS_FUNCTIONS6 = 3; /* modifies type of RDB$MODULE_NAME field */ +const int ODS_SQLNAMES6 = 4; /* permits SQL security on > 27 SCHAR names */ +const int ODS_CURRENT6 = 4; /* Minor versions for ODS 7 */ -#define ODS_FUNCTIONS7 1 /* modifies type of RDB$MODULE_NAME field */ -#define ODS_SQLNAMES7 2 /* permits SQL security on > 27 SCHAR names */ -#define ODS_CURRENT7 2 +const int ODS_FUNCTIONS7 = 1; /* modifies type of RDB$MODULE_NAME field */ +const int ODS_SQLNAMES7 = 2; /* permits SQL security on > 27 SCHAR names */ +const int ODS_CURRENT7 = 2; /* Minor versions for ODS 8 */ -#define ODS_CASCADE_RI8 1 /* permits cascading referential integrity */ +const int ODS_CASCADE_RI8 = 1; /* permits cascading referential integrity */ /* ODS 8.2 is the same as ODS 8.1 */ -#define ODS_CURRENT8 2 +const int ODS_CURRENT8 = 2; /* Minor versions for ODS 9 */ -#define ODS_CURRENT_9_0 0 /* SQL roles & Index garbage collection */ -#define ODS_SYSINDEX9 1 /* Index on RDB$CHECK_CONSTRAINTS (RDB$TRIGGER_NAME) */ -#define ODS_CURRENT9 1 +const int ODS_CURRENT_9_0 = 0; /* SQL roles & Index garbage collection */ +const int ODS_SYSINDEX9 = 1; /* Index on RDB$CHECK_CONSTRAINTS (RDB$TRIGGER_NAME) */ +const int ODS_CURRENT9 = 1; /* Minor versions for ODS 10 */ -#define ODS_CURRENT10_0 0 /* V6.0 features. SQL delimited identifier, +const int ODS_CURRENT10_0 = 0; /* V6.0 features. SQL delimited identifier, SQLDATE, and 64-bit exact numeric type */ -#define ODS_SYSINDEX10 1 /* New system indices */ -#define ODS_CURRENT10 1 +const int ODS_SYSINDEX10 = 1; /* New system indices */ +const int ODS_CURRENT10 = 1; /* Minor versions for ODS 11 */ -#define ODS_CURRENT11_0 0 /* Firebird 2.0 features. */ -#define ODS_CURRENT11 0 +const int ODS_CURRENT11_0 = 0; /* Firebird 2.0 features. */ +const int ODS_CURRENT11 = 0; /* useful ODS macros. These are currently used to flag the version of the system triggers and system indices in ini.e */ @@ -115,40 +115,40 @@ /* Set current ODS major and minor version */ -#define ODS_VERSION ODS_VERSION11 /* current ods major version -- always +const int ODS_VERSION = ODS_VERSION11; /* current ods major version -- always the highest */ -#define ODS_CURRENT ODS_CURRENT11 /* the highest defined minor version +const int ODS_CURRENT = ODS_CURRENT11; /* the highest defined minor version number for this ODS_VERSION!! */ -#define ODS_CURRENT_VERSION ODS_11_0 /* Current ODS version in use which includes +const int ODS_CURRENT_VERSION = ODS_11_0; /* Current ODS version in use which includes both Major and Minor ODS versions! */ -#define USER_REL_INIT_ID_ODS8 31 /* ODS <= 8 */ -#define USER_DEF_REL_INIT_ID 128 /* ODS >= 9 */ +const int USER_REL_INIT_ID_ODS8 = 31; /* ODS <= 8 */ +const int USER_DEF_REL_INIT_ID = 128; /* ODS >= 9 */ /* Page types */ -#define pag_undefined 0 -#define pag_header 1 /* Database header page */ -#define pag_pages 2 /* Page inventory page */ -#define pag_transactions 3 /* Transaction inventory page */ -#define pag_pointer 4 /* Pointer page */ -#define pag_data 5 /* Data page */ -#define pag_root 6 /* Index root page */ -#define pag_index 7 /* Index (B-tree) page */ -#define pag_blob 8 /* Blob data page */ -#define pag_ids 9 /* Gen-ids */ -#define pag_log 10 /* Write ahead log information */ -#define pag_max 10 /* Max page type */ +const int pag_undefined = 0; +const int pag_header = 1; /* Database header page */ +const int pag_pages = 2; /* Page inventory page */ +const int pag_transactions = 3; /* Transaction inventory page */ +const int pag_pointer = 4; /* Pointer page */ +const int pag_data = 5; /* Data page */ +const int pag_root = 6; /* Index root page */ +const int pag_index = 7; /* Index (B-tree) page */ +const int pag_blob = 8; /* Blob data page */ +const int pag_ids = 9; /* Gen-ids */ +const int pag_log = 10; /* Write ahead log information */ +const int pag_max = 10; /* Max page type */ -#define HEADER_PAGE 0 -#define LOG_PAGE 2 +const int HEADER_PAGE = 0; +const int LOG_PAGE = 2; -#define MIN_PAGE_SIZE 1024 +const int MIN_PAGE_SIZE = 1024; -#define MAX_PAGE_SIZE 16384 -#define DEFAULT_PAGE_SIZE 4096 +const int MAX_PAGE_SIZE = 16384; +const int DEFAULT_PAGE_SIZE = 4096; namespace Ods { @@ -178,9 +178,9 @@ SLONG blp_page[1]; /* Page number if level 1 */ }; -#define BLP_SIZE OFFSETA (Ods::blob_page*, blp_page) +#define BLP_SIZE OFFSETA(Ods::blob_page*, blp_page) -#define blp_pointers 1 /* Blob pointer page, not data page */ +const int blp_pointers = 1; /* Blob pointer page, not data page */ /* B-tree node */ @@ -193,7 +193,7 @@ UCHAR btn_data[1]; }; -#define BTN_SIZE 6 +const int BTN_SIZE = 6; // B-tree page ("bucket") struct btree_page : public pag @@ -210,8 +210,8 @@ }; // Firebird B-tree nodes -#define BTN_LEAF_SIZE 6 -#define BTN_PAGE_SIZE 10 +const int BTN_LEAF_SIZE = 6; +const int BTN_PAGE_SIZE = 10; struct IndexNode { @@ -240,14 +240,14 @@ UCHAR jumpers; // nr of jump-nodes in page, with a maximum of 255 }; -#define btr_dont_gc 1 // Don't garbage-collect this page -#define btr_not_propogated 2 // page is not propogated upward -#define btr_descending 8 // Page/bucket is part of a descending index -#define btr_all_record_number 16 // Non-leaf-nodes will contain record number information -#define btr_large_keys 32 // AB: 2003-index-structure enhancement -#define btr_jump_info 64 // AB: 2003-index-structure enhancement +const int btr_dont_gc = 1; // Don't garbage-collect this page +const int btr_not_propogated = 2; // page is not propogated upward +const int btr_descending = 8; // Page/bucket is part of a descending index +const int btr_all_record_number = 16; // Non-leaf-nodes will contain record number information +const int btr_large_keys = 32; // AB: 2003-index-structure enhancement +const int btr_jump_info = 64; // AB: 2003-index-structure enhancement -#define BTR_FLAG_COPY_MASK (btr_descending | btr_all_record_number | btr_large_keys | btr_jump_info) +const int BTR_FLAG_COPY_MASK = (btr_descending | btr_all_record_number | btr_large_keys | btr_jump_info); /* Data Page */ @@ -265,9 +265,9 @@ #define DPG_SIZE (sizeof (Ods::data_page) - sizeof (Ods::data_page::dpg_repeat)) -#define dpg_orphan 1 /* Data page is NOT in pointer page */ -#define dpg_full 2 /* Pointer page is marked FULL */ -#define dpg_large 4 /* Large object is on page */ +const int dpg_orphan = 1; /* Data page is NOT in pointer page */ +const int dpg_full = 2; /* Pointer page is marked FULL */ +const int dpg_large = 4; /* Large object is on page */ /* Index root page */ @@ -300,16 +300,16 @@ float irtd_selectivity; } IRTD; -#define irt_unique 1 -#define irt_descending 2 -#define irt_in_progress 4 -#define irt_foreign 8 -#define irt_primary 16 -#define irt_expression 32 - -#define STUFF_COUNT 4 -#define END_LEVEL -1 -#define END_BUCKET -2 +const int irt_unique = 1; +const int irt_descending = 2; +const int irt_in_progress = 4; +const int irt_foreign = 8; +const int irt_primary = 16; +const int irt_expression = 32; + +const int STUFF_COUNT = 4; +const int END_LEVEL = -1; +const int END_BUCKET = -2; /* Header page */ @@ -349,43 +349,43 @@ <type_byte> <length_byte> <data...> */ -#define HDR_end 0 -#define HDR_root_file_name 1 /* Original name of root file */ -#define HDR_journal_server 2 /* Name of journal server */ -#define HDR_file 3 /* Secondary file */ -#define HDR_last_page 4 /* Last logical page number of file */ -#define HDR_unlicensed 5 /* Count of unlicensed activity */ -#define HDR_sweep_interval 6 /* Transactions between sweeps */ -#define HDR_log_name 7 /* replay log name */ -#define HDR_journal_file 8 /* Intermediate journal file */ -#define HDR_password_file_key 9 /* Key to compare to password db */ -#define HDR_backup_info 10 /* WAL backup information */ -#define HDR_cache_file 11 /* Shared cache file */ -#define HDR_difference_file 12 /* Delta file that is used during backup lock */ -#define HDR_backup_guid 13 /* UID generated on each switch into backup mode */ -#define HDR_max 14 /* Maximum HDR_clump value */ +const int HDR_end = 0; +const int HDR_root_file_name = 1; /* Original name of root file */ +const int HDR_journal_server = 2; /* Name of journal server */ +const int HDR_file = 3; /* Secondary file */ +const int HDR_last_page = 4; /* Last logical page number of file */ +const int HDR_unlicensed = 5; /* Count of unlicensed activity */ +const int HDR_sweep_interval = 6; /* Transactions between sweeps */ +const int HDR_log_name = 7; /* replay log name */ +const int HDR_journal_file = 8; /* Intermediate journal file */ +const int HDR_password_file_key = 9; /* Key to compare to password db */ +const int HDR_backup_info = 10; /* WAL backup information */ +const int HDR_cache_file = 11; /* Shared cache file */ +const int HDR_difference_file = 12; /* Delta file that is used during backup lock */ +const int HDR_backup_guid = 13; /* UID generated on each switch into backup mode */ +const int HDR_max = 14; /* Maximum HDR_clump value */ /* Header page flags */ -#define hdr_active_shadow 0x1 /* 1 file is an active shadow file */ -#define hdr_force_write 0x2 /* 2 database is forced write */ -#define hdr_short_journal 0x4 /* 4 short-term journalling */ -#define hdr_long_journal 0x8 /* 8 long-term journalling */ -#define hdr_no_checksums 0x10 /* 16 don't calculate checksums */ -#define hdr_no_reserve 0x20 /* 32 don't reserve space for versions */ -#define hdr_disable_cache 0x40 /* 64 disable using shared cache file */ -//#define hdr_shutdown 0x80 /* 128 database is shutdown */ -#define hdr_SQL_dialect_3 0x100 /* 256 database SQL dialect 3 */ -#define hdr_read_only 0x200 /* 512 Database in ReadOnly. If not set, DB is RW */ +const int hdr_active_shadow = 0x1; /* 1 file is an active shadow file */ +const int hdr_force_write = 0x2; /* 2 database is forced write */ +const int hdr_short_journal = 0x4; /* 4 short-term journalling */ +const int hdr_long_journal = 0x8; /* 8 long-term journalling */ +const int hdr_no_checksums = 0x10; /* 16 don't calculate checksums */ +const int hdr_no_reserve = 0x20; /* 32 don't reserve space for versions */ +const int hdr_disable_cache = 0x40; /* 64 disable using shared cache file */ +//const int hdr_shutdown = 0x80; /* 128 database is shutdown */ +const int hdr_SQL_dialect_3 = 0x100; /* 256 database SQL dialect 3 */ +const int hdr_read_only = 0x200; /* 512 Database in ReadOnly. If not set, DB is RW */ /* backup status mask - see bit values in nbak.h */ -#define hdr_backup_mask 0xC00 -#define hdr_shutdown_mask 0x1080 +const int hdr_backup_mask = 0xC00; +const int hdr_shutdown_mask = 0x1080; // Values for shutdown mask -#define hdr_shutdown_none 0x0 -#define hdr_shutdown_multi 0x80 -#define hdr_shutdown_full 0x1000 -#define hdr_shutdown_single 0x1080 +const int hdr_shutdown_none = 0x0; +const int hdr_shutdown_multi = 0x80; +const int hdr_shutdown_full = 0x1000; +const int hdr_shutdown_single = 0x1080; /* typedef struct sfd { @@ -420,9 +420,7 @@ SLONG ppg_page[1]; /* Data page vector */ }; -#define ppg_bits ppg_page - -#define ppg_eof 1 /* Last pointer page in relation */ +const int ppg_eof = 1; /* Last pointer page in relation */ /* Transaction Inventory Page */ @@ -492,19 +490,18 @@ SLONG blh_page[1]; /* Page vector for blob pages */ } *BLH; -#define blh_data blh_page #define BLH_SIZE OFFSETA (Ods::blh*, blh_page) -#define rhd_deleted 1 /* record is logically deleted */ -#define rhd_chain 2 /* record is an old version */ -#define rhd_fragment 4 /* record is a fragment */ -#define rhd_incomplete 8 /* record is incomplete */ -#define rhd_blob 16 /* isn't a record but a blob */ -#define rhd_stream_blob 32 /* blob is a stream mode blob */ -#define rhd_delta 32 /* prior version is differences only */ -#define rhd_large 64 /* object is large */ -#define rhd_damaged 128 /* object is known to be damaged */ -#define rhd_gc_active 256 /* garbage collecting dead record version */ +const int rhd_deleted = 1; /* record is logically deleted */ +const int rhd_chain = 2; /* record is an old version */ +const int rhd_fragment = 4; /* record is a fragment */ +const int rhd_incomplete = 8; /* record is incomplete */ +const int rhd_blob = 16; /* isn't a record but a blob */ +const int rhd_stream_blob = 32; /* blob is a stream mode blob */ +const int rhd_delta = 32; /* prior version is differences only */ +const int rhd_large = 64; /* object is large */ +const int rhd_damaged = 128; /* object is known to be damaged */ +const int rhd_gc_active = 256; /* garbage collecting dead record version */ /* Log page */ @@ -532,27 +529,27 @@ UCHAR log_data[1]; }; -#define LIP_SIZE OFFSETA (Ods::log_info_page*, log_data); +#define LIP_SIZE OFFSETA (Ods::log_info_page*, log_data) /* additions for write ahead log, almost obsolete. */ -//#define CTRL_FILE_LEN 255 /* Pre allocated size of file name */ -#define CLUMP_ADD 0 -#define CLUMP_REPLACE 1 -#define CLUMP_REPLACE_ONLY 2 +//const int CTRL_FILE_LEN = 255; /* Pre allocated size of file name */ +const int CLUMP_ADD = 0; +const int CLUMP_REPLACE = 1; +const int CLUMP_REPLACE_ONLY= 2; /* Log Clumplet types */ -#define LOG_end HDR_end -//#define LOG_ctrl_file1 1 /* file name of 2nd last control pt */ -//#define LOG_ctrl_file2 2 /* file name of last ctrl pt */ -//#define LOG_logfile 3 /* Primary WAL file name */ -//#define LOG_backup_info 4 /* Journal backup directory */ -//#define LOG_chkpt_len 5 /* checkpoint length */ -//#define LOG_num_bufs 6 /* Number of log buffers */ -//#define LOG_bufsize 7 /* Buffer size */ -//#define LOG_grp_cmt_wait 8 /* Group commit wait time */ -#define LOG_max 8 /* Maximum LOG_clump value */ +const int LOG_end = HDR_end; +//const int LOG_ctrl_file1 1 /* file name of 2nd last control pt */ +//const int LOG_ctrl_file2 2 /* file name of last ctrl pt */ +//const int LOG_logfile 3 /* Primary WAL file name */ +//const int LOG_backup_info 4 /* Journal backup directory */ +//const int LOG_chkpt_len 5 /* checkpoint length */ +//const int LOG_num_bufs 6 /* Number of log buffers */ +//const int LOG_bufsize 7 /* Buffer size */ +//const int LOG_grp_cmt_wait 8 /* Group commit wait time */ +const int LOG_max = 8; /* Maximum LOG_clump value */ } //namespace Jrd Index: obj.h =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/obj.h,v retrieving revision 1.3 retrieving revision 1.4 diff -b -U3 -r1.3 -r1.4 --- obj.h 3 Oct 2003 01:47:25 -0000 1.3 +++ obj.h 30 Apr 2004 22:45:38 -0000 1.4 @@ -27,22 +27,22 @@ /* Object types used in RDB$DEPENDENCIES and RDB$USER_PRIVILEGES */ /* Note: some values are hard coded in grant.gdl */ -#define obj_relation 0 -#define obj_view 1 -#define obj_trigger 2 -#define obj_computed 3 -#define obj_validation 4 -#define obj_procedure 5 -#define obj_expression_index 6 -#define obj_exception 7 -#define obj_user 8 -#define obj_field 9 -#define obj_index 10 -#define obj_count 11 -#define obj_user_group 12 -#define obj_sql_role 13 -#define obj_generator 14 -#define obj_udf 15 -#define obj_blob_filter 16 +const int obj_relation = 0; +const int obj_view = 1; +const int obj_trigger = 2; +const int obj_computed = 3; +const int obj_validation = 4; +const int obj_procedure = 5; +const int obj_expression_index = 6; +const int obj_exception = 7; +const int obj_user = 8; +const int obj_field = 9; +const int obj_index = 10; +const int obj_count = 11; +const int obj_user_group = 12; +const int obj_sql_role = 13; +const int obj_generator = 14; +const int obj_udf = 15; +const int obj_blob_filter = 16; #endif /* JRD_OBJ_H */ Index: nbak.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/nbak.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -b -U3 -r1.29 -r1.30 --- nbak.cpp 22 Mar 2004 11:37:55 -0000 1.29 +++ nbak.cpp 30 Apr 2004 22:45:38 -0000 1.30 @@ -575,12 +575,12 @@ // Set state in database header page. All changes are written to main database file yet. CCH_MARK_MUST_WRITE(tdbb, &window); int newState = nbak_state_stalled; - header->hdr_flags = (header->hdr_flags & ~hdr_backup_mask) | newState; + header->hdr_flags = (header->hdr_flags & ~Ods::hdr_backup_mask) | newState; // This number may be smaller than actual because some pages may be not flushed to // disk yet. This is not a problem as it can cause only a slight performance degradation backup_pages = header->hdr_backup_pages = PIO_act_alloc(database); const ULONG adjusted_scn = ++header->pag_scn; // Generate new SCN - PAG_replace_entry_first(header, HDR_backup_guid, sizeof(guid), + PAG_replace_entry_first(header, Ods::HDR_backup_guid, sizeof(guid), reinterpret_cast<const UCHAR*>(&guid)); header_locked = false; @@ -678,7 +678,7 @@ header->pag_scn = current_scn; NBAK_TRACE(("new SCN=%d is getting written to header", adjusted_scn)); // Adjust state - header->hdr_flags = (header->hdr_flags & ~hdr_backup_mask) | backup_state; + header->hdr_flags = (header->hdr_flags & ~Ods::hdr_backup_mask) | backup_state; header_locked = false; CCH_RELEASE(tdbb, &window); tdbb->tdbb_flags &= ~TDBB_set_backup_state; @@ -759,7 +759,7 @@ backup_state = nbak_state_normal; CCH_MARK_MUST_WRITE(tdbb, &window); // Adjust state - header->hdr_flags = (header->hdr_flags & ~hdr_backup_mask) | backup_state; + header->hdr_flags = (header->hdr_flags & ~Ods::hdr_backup_mask) | backup_state; NBAK_TRACE(("Set state %d in header page", backup_state)); // Generate new SCN header->pag_scn = ++current_scn; @@ -1046,13 +1046,13 @@ Ods::header_page* header = (Ods::header_page*) CCH_FETCH(tdbb, &window, LCK_write, pag_header); CCH_MARK_MUST_WRITE(tdbb, &window); - PAG_replace_entry_first(header, HDR_difference_file, + PAG_replace_entry_first(header, Ods::HDR_difference_file, strlen(filename), reinterpret_cast<const UCHAR*>(filename)); CCH_RELEASE(tdbb, &window); strncpy(diff_name, filename, sizeof(diff_name)); } else { - PAG_delete_clump_entry(HEADER_PAGE, HDR_difference_file); + PAG_delete_clump_entry(HEADER_PAGE, Ods::HDR_difference_file); generate_filename(); } } @@ -1090,7 +1090,7 @@ } } - const int new_backup_state = header->hdr_flags & hdr_backup_mask; + const int new_backup_state = header->hdr_flags & Ods::hdr_backup_mask; NBAK_TRACE(("backup state read from header is %d", new_backup_state)); // Check is we missed lock/unlock cycle and need to invalidate // our allocation table and file handle @@ -1103,10 +1103,10 @@ const UCHAR* p = header->hdr_data; while (true) { switch (*p) { - case HDR_backup_guid: + case Ods::HDR_backup_guid: p += p[1] + 2; continue; - case HDR_difference_file: + case Ods::HDR_difference_file: fname_found = true; memcpy(diff_name, p + 2, p[1]); diff_name[p[1]] = 0; Index: nav.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/nav.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -b -U3 -r1.38 -r1.39 --- nav.cpp 28 Mar 2004 09:10:15 -0000 1.38 +++ nav.cpp 30 Apr 2004 22:45:38 -0000 1.39 @@ -939,7 +939,7 @@ const index_desc::idx_repeat* tail; if (idx->idx_count > 1) { segment = key_string1 + - ((length2 - 1) / (STUFF_COUNT + 1)) * (STUFF_COUNT + 1); + ((length2 - 1) / (Ods::STUFF_COUNT + 1)) * (Ods::STUFF_COUNT + 1); tail = idx->idx_rpt + (idx->idx_count - *segment); } else { @@ -959,7 +959,7 @@ if (idx->idx_count > 1) { // if we've exhausted the segment, we've found a match - USHORT remainder = length2 % (STUFF_COUNT + 1); + USHORT remainder = length2 % (Ods::STUFF_COUNT + 1); if (!remainder && (*string1 != *segment)) { return 0; @@ -967,7 +967,7 @@ // if the rest of the key segment is 0's, we've found a match if (remainder) { - for (remainder = STUFF_COUNT + 1 - remainder; remainder; + for (remainder = Ods::STUFF_COUNT + 1 - remainder; remainder; remainder--) { if (*string1++) { Index: met.epp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/met.epp,v retrieving revision 1.113 retrieving revision 1.114 diff -b -U3 -r1.113 -r1.114 --- met.epp 28 Apr 2004 22:39:06 -0000 1.113 +++ met.epp 30 Apr 2004 22:45:38 -0000 1.114 @@ -51,7 +51,6 @@ #include "../jrd/common.h" #include <stdarg.h> -#include "../jrd/constants.h" #include "../jrd/y_ref.h" #include "../jrd/ibase.h" #include "../jrd/jrd.h" Index: intlobj.h =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/intlobj.h,v retrieving revision 1.21 retrieving revision 1.22 diff -b -U3 -r1.21 -r1.22 --- intlobj.h 25 Apr 2004 02:30:32 -0000 1.21 +++ intlobj.h 30 Apr 2004 22:45:38 -0000 1.22 @@ -69,10 +69,6 @@ #define type_charset 55 #define type_csconvert 56 -#ifndef JRD_CONSTANTS_H -#define MAX_KEY 4096 -#endif - namespace Jrd { class vec; struct thread_db; Index: intl_classes.h =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/intl_classes.h,v retrieving revision 1.17 retrieving revision 1.18 diff -b -U3 -r1.17 -r1.18 --- intl_classes.h 25 Apr 2004 02:30:32 -0000 1.17 +++ intl_classes.h 30 Apr 2004 22:45:38 -0000 1.18 @@ -38,7 +38,6 @@ #include "firebird.h" #include "../jrd/jrd.h" -#include "../jrd/constants.h" #include "../jrd/intlobj.h" namespace Jrd { Index: ini.h =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/ini.h,v retrieving revision 1.14 retrieving revision 1.15 diff -b -U3 -r1.14 -r1.15 --- ini.h 30 Mar 2004 08:34:14 -0000 1.14 +++ ini.h 30 Apr 2004 22:45:38 -0000 1.15 @@ -107,18 +107,18 @@ (UCHAR) name, (UCHAR) id, update, ods, (UCHAR) upd_id, upd_ods, #define END_RELATION 0, -#define RFLD_R_NAME 0 -#define RFLD_R_ID 1 -#define RFLD_R_MINOR 2 -#define RFLD_RPT 3 - -#define RFLD_F_NAME 0 -#define RFLD_F_ID 1 -#define RFLD_F_UPDATE 2 -#define RFLD_F_MINOR 3 -#define RFLD_F_UPD_ID 4 -#define RFLD_F_UPD_MINOR 5 -#define RFLD_F_LENGTH 6 +const int RFLD_R_NAME = 0; +const int RFLD_R_ID = 1; +const int RFLD_R_MINOR = 2; +const int RFLD_RPT = 3; + +const int RFLD_F_NAME = 0; +const int RFLD_F_ID = 1; +const int RFLD_F_UPDATE = 2; +const int RFLD_F_MINOR = 3; +const int RFLD_F_UPD_ID = 4; +const int RFLD_F_UPD_MINOR = 5; +const int RFLD_F_LENGTH = 6; static const UCHAR relfields[] = { Index: ini.epp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/ini.epp,v retrieving revision 1.44 retrieving revision 1.45 diff -b -U3 -r1.44 -r1.45 --- ini.epp 29 Apr 2004 17:48:39 -0000 1.44 +++ ini.epp 30 Apr 2004 22:45:38 -0000 1.45 @@ -37,7 +37,6 @@ #include "../jrd/trig.h" #include "../jrd/intl.h" #include "../jrd/dflt.h" -#include "../jrd/constants.h" #include "../jrd/ini.h" #include "../jrd/idx.h" #include "../jrd/gdsassert.h" Index: ibase.h =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/ibase.h,v retrieving revision 1.72 retrieving revision 1.73 diff -b -U3 -r1.72 -r1.73 --- ibase.h 29 Apr 2004 17:48:39 -0000 1.72 +++ ibase.h 30 Apr 2004 22:45:38 -0000 1.73 @@ -73,10 +73,6 @@ typedef unsigned char ISC_UCHAR; -#define DSQL_close 1 -#define DSQL_drop 2 - - /********************************/ /* InterBase Handle Definitions */ /********************************/ @@ -305,43 +301,11 @@ /* Dynamic SQL definitions */ /***************************/ -/******************************/ -/* Declare the extended SQLDA */ -/******************************/ - -#ifndef FB_SQLDA - -typedef struct -{ - short sqltype; /* datatype of field */ - short sqlscale; /* scale factor */ - short sqlsubtype; /* datatype subtype - BLOBs & Text types only */ - short sqllen; /* length of data area */ - char * sqldata; /* address of data */ - short * sqlind; /* address of indicator variable */ - short sqlname_length; /* length of sqlname field */ - char sqlname[32]; /* name of field, name length + space for NULL */ - short relname_length; /* length of relation name */ - char relname[32]; /* field's relation name + space for NULL */ - short ownname_length; /* length of owner name */ - char ownname[32]; /* relation's owner name + space for NULL */ - short aliasname_length; /* length of alias name */ - char aliasname[32]; /* relation's alias name + space for NULL */ -} XSQLVAR; - -typedef struct -{ - short version; /* version of this XSQLDA */ - char sqldaid[8]; /* XSQLDA name field */ - ISC_LONG sqldabc; /* length in bytes of SQLDA */ - short sqln; /* number of fields allocated */ - short sqld; /* actual number of fields */ - XSQLVAR sqlvar[1]; /* first field address */ -} XSQLDA; +#include "../dsql/sqlda_pub.h" -#define XSQLDA_LENGTH(n) (sizeof (XSQLDA) + ((n)-1) * sizeof (XSQLVAR)) - -#define SQLDA_VERSION1 1 +/***************************/ +/* SQL Dialects */ +/***************************/ #define SQL_DIALECT_V5 1 /* meaning is same as DIALECT_xsqlda */ #define SQL_DIALECT_V6_TRANSITION 2 /* flagging anything that is delimited @@ -355,9 +319,6 @@ #define SQL_DIALECT_CURRENT SQL_DIALECT_V6 /* latest IB DIALECT */ -#define FB_SQLDA -#endif - /***************************/ /* OSRI database functions */ /***************************/ @@ -2334,28 +2295,6 @@ #define isc_interp_jpn_sjis 5 #define isc_interp_jpn_euc 6 -/*******************/ -/* SQL definitions */ -/*******************/ - -#define SQL_TEXT 452 -#define SQL_VARYING 448 -#define SQL_SHORT 500 -#define SQL_LONG 496 -#define SQL_FLOAT 482 -#define SQL_DOUBLE 480 -#define SQL_D_FLOAT 530 -#define SQL_TIMESTAMP 510 -#define SQL_BLOB 520 -#define SQL_ARRAY 540 -#define SQL_QUAD 550 -#define SQL_TYPE_TIME 560 -#define SQL_TYPE_DATE 570 -#define SQL_INT64 580 - -/* Historical alias for pre V6 applications */ -#define SQL_DATE SQL_TIMESTAMP - /*****************/ /* Blob Subtypes */ /*****************/ Index: fun.epp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/fun.epp,v retrieving revision 1.49 retrieving revision 1.50 diff -b -U3 -r1.49 -r1.50 --- fun.epp 21 Apr 2004 14:10:34 -0000 1.49 +++ fun.epp 30 Apr 2004 22:45:38 -0000 1.50 @@ -49,7 +49,6 @@ #include "../jrd/blb.h" #include "../jrd/flu.h" #include "../jrd/common.h" -#include "../jrd/constants.h" #include "../jrd/ibsetjmp.h" #include "../jrd/irq.h" #include "../jrd/all_proto.h" Index: evl.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/evl.cpp,v retrieving revision 1.80 retrieving revision 1.81 diff -b -U3 -r1.80 -r1.81 --- evl.cpp 29 Apr 2004 17:48:39 -0000 1.80 +++ evl.cpp 30 Apr 2004 22:45:38 -0000 1.81 @@ -84,7 +84,6 @@ #include "../jrd/sort.h" #include "../jrd/blr.h" #include "../jrd/tra.h" -#include "../jrd/constants.h" #include "../jrd/gdsassert.h" #include "../jrd/jrd_time.h" #include "../jrd/all_proto.h" Index: dyn_def.epp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/dyn_def.epp,v retrieving revision 1.64 retrieving revision 1.65 diff -b -U3 -r1.64 -r1.65 --- dyn_def.epp 29 Apr 2004 11:16:31 -0000 1.64 +++ dyn_def.epp 30 Apr 2004 22:45:38 -0000 1.65 @@ -45,7 +45,6 @@ #include "../jrd/common.h" #include <stdarg.h> -#include "../jrd/constants.h" #include "../jrd/jrd.h" #include "../jrd/ods.h" #include "../jrd/tra.h" Index: dsc2.h =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/dsc2.h,v retrieving revision 1.3 retrieving revision 1.4 diff -b -U3 -r1.3 -r1.4 --- dsc2.h 29 Apr 2004 17:48:39 -0000 1.3 +++ dsc2.h 30 Apr 2004 22:45:39 -0000 1.4 @@ -26,7 +26,6 @@ #ifndef JRD_DSC_H #define JRD_DSC_H -#include "../jrd/constants.h" #include "../jrd/gdsassert.h" // Descriptor format Index: dsc.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/dsc.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -b -U3 -r1.18 -r1.19 --- dsc.cpp 29 Apr 2004 17:48:39 -0000 1.18 +++ dsc.cpp 30 Apr 2004 22:45:39 -0000 1.19 @@ -30,7 +30,6 @@ #include "../jrd/dsc.h" #include "../jrd/y_ref.h" #include "../jrd/ibase.h" -#include "../jrd/constants.h" #include "../jrd/intl.h" #include "../jrd/gds_proto.h" #include "../jrd/gdsassert.h" Index: dpm.epp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/dpm.epp,v retrieving revision 1.44 retrieving revision 1.45 diff -b -U3 -r1.44 -r1.45 --- dpm.epp 28 Apr 2004 22:36:30 -0000 1.44 +++ dpm.epp 30 Apr 2004 22:45:39 -0000 1.45 @@ -1373,7 +1373,7 @@ 1 and 2). */ const USHORT length = index->dpg_length - BLH_SIZE; - const UCHAR* q = (UCHAR *) header->blh_data; + const UCHAR* q = (UCHAR *) header->blh_page; if (blob->blb_level == 0) { blob->blb_space_remaining = length; @@ -1973,7 +1973,7 @@ header->blh_length = blob->blb_length; header->blh_level = blob->blb_level; header->blh_sub_type = blob->blb_sub_type; - UCHAR* p = (UCHAR *) header->blh_data; + UCHAR* p = (UCHAR *) header->blh_page; if (length) { MOVE_FASTER(q, p, length); Index: dfw.epp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/dfw.epp,v retrieving revision 1.102 retrieving revision 1.103 diff -b -U3 -r1.102 -r1.103 --- dfw.epp 29 Apr 2004 17:48:39 -0000 1.102 +++ dfw.epp 30 Apr 2004 22:45:39 -0000 1.103 @@ -76,7 +76,6 @@ #include "../intl/charsets.h" #include "../jrd/align.h" #include "../jrd/gdsassert.h" -#include "../jrd/constants.h" #include "../jrd/all_proto.h" #include "../jrd/blb_proto.h" #include "../jrd/btr_proto.h" Index: dbg.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/dbg.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -b -U3 -r1.24 -r1.25 --- dbg.cpp 28 Apr 2004 22:36:30 -0000 1.24 +++ dbg.cpp 30 Apr 2004 22:45:39 -0000 1.25 @@ -42,7 +42,6 @@ #include "../jrd/cch_proto.h" #include "../jrd/dbg_proto.h" #include "../jrd/err_proto.h" -#include "../jrd/constants.h" #ifdef SUPERSERVER #include "../jrd/thd_proto.h" Index: cvt2.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/cvt2.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -b -U3 -r1.30 -r1.31 --- cvt2.cpp 29 Apr 2004 17:48:39 -0000 1.30 +++ cvt2.cpp 30 Apr 2004 22:45:39 -0000 1.31 @@ -48,7 +48,6 @@ /* CVC: I needed them here. */ #include "../jrd/jrd.h" #include "../jrd/blb_proto.h" -#include "../jrd/constants.h" #include "../jrd/tra.h" #include "../jrd/req.h" Index: cmp.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/cmp.cpp,v retrieving revision 1.115 retrieving revision 1.116 diff -b -U3 -r1.115 -r1.116 --- cmp.cpp 29 Apr 2004 14:49:11 -0000 1.115 +++ cmp.cpp 30 Apr 2004 22:45:39 -0000 1.116 @@ -62,7 +62,6 @@ #include "../jrd/intl.h" #include "../jrd/rng.h" #include "../jrd/btr.h" -#include "../jrd/constants.h" #include "../jrd/gdsassert.h" #include "../jrd/all_proto.h" #include "../jrd/cmp_proto.h" Index: blob_filter.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/blob_filter.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -b -U3 -r1.26 -r1.27 --- blob_filter.cpp 29 Apr 2004 17:48:39 -0000 1.26 +++ blob_filter.cpp 30 Apr 2004 22:45:39 -0000 1.27 @@ -42,7 +42,6 @@ #include "../jrd/ibase.h" #include "../jrd/blob_filter.h" #include "../jrd/tra.h" -#include "../jrd/constants.h" #include "../jrd/gdsassert.h" #include "../jrd/blf_proto.h" #include "../jrd/filte_proto.h" Index: blb.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/jrd/blb.cpp,v retrieving revision 1.71 retrieving revision 1.72 diff -b -U3 -r1.71 -r1.72 --- blb.cpp 29 Apr 2004 17:48:39 -0000 1.71 +++ blb.cpp 30 Apr 2004 22:45:39 -0000 1.72 @@ -55,8 +55,6 @@ #include "../jrd/sdl.h" #include "../jrd/intl.h" #include "../jrd/cch.h" -//#include "../jrd/common.h" -#include "../jrd/constants.h" #include "../jrd/gdsassert.h" #include "../jrd/all_proto.h" #include "../jrd/blb_proto.h" @@ -2191,7 +2189,7 @@ blob->blb_level = 2; page = (blob_page*) DPM_allocate(tdbb, &window); - page->pag_flags = blp_pointers; + page->pag_flags = Ods::blp_pointers; page->pag_type = pag_blob; page->blp_lead_page = blob->blb_lead_page; page->blp_length = vector->count() << SHIFTLONG; @@ -2213,7 +2211,7 @@ } else { page = (blob_page*) DPM_allocate(tdbb, &window); - page->pag_flags = blp_pointers; + page->pag_flags = Ods::blp_pointers; page->pag_type = pag_blob; page->blp_lead_page = blob->blb_lead_page; vector->resize(l + 1); |