diff --git a/builds/win32/msvc6/alice.dsp b/builds/win32/msvc6/alice.dsp index 57e2355eb8..d97a744e58 100644 --- a/builds/win32/msvc6/alice.dsp +++ b/builds/win32/msvc6/alice.dsp @@ -138,10 +138,6 @@ SOURCE=..\..\..\src\alice\alloc.h # End Source File # Begin Source File -SOURCE=..\..\..\src\alice\blk.h -# End Source File -# Begin Source File - SOURCE=..\..\..\src\alice\exe_proto.h # End Source File # Begin Source File diff --git a/builds/win32/msvc6/alice_classic.dsp b/builds/win32/msvc6/alice_classic.dsp index 59fafe9c21..128325a708 100644 --- a/builds/win32/msvc6/alice_classic.dsp +++ b/builds/win32/msvc6/alice_classic.dsp @@ -138,10 +138,6 @@ SOURCE=..\..\..\src\alice\alloc.h # End Source File # Begin Source File -SOURCE=..\..\..\src\alice\blk.h -# End Source File -# Begin Source File - SOURCE=..\..\..\src\alice\exe_proto.h # End Source File # Begin Source File diff --git a/builds/win32/msvc6/dsql_server.dsp b/builds/win32/msvc6/dsql_server.dsp index 8fdeaa6c64..bff12df7d8 100644 --- a/builds/win32/msvc6/dsql_server.dsp +++ b/builds/win32/msvc6/dsql_server.dsp @@ -198,10 +198,6 @@ SOURCE=..\..\..\src\dsql\array_proto.h # End Source File # Begin Source File -SOURCE=..\..\..\src\dsql\blk.h -# End Source File -# Begin Source File - SOURCE=..\..\..\src\dsql\blob_proto.h # End Source File # Begin Source File diff --git a/builds/win32/msvc6/dsql_server_classic.dsp b/builds/win32/msvc6/dsql_server_classic.dsp index c5a94a5df9..93c21c83be 100644 --- a/builds/win32/msvc6/dsql_server_classic.dsp +++ b/builds/win32/msvc6/dsql_server_classic.dsp @@ -198,10 +198,6 @@ SOURCE=..\..\..\src\dsql\array_proto.h # End Source File # Begin Source File -SOURCE=..\..\..\src\dsql\blk.h -# End Source File -# Begin Source File - SOURCE=..\..\..\src\dsql\blob_proto.h # End Source File # Begin Source File diff --git a/builds/win32/msvc6/engine.dsp b/builds/win32/msvc6/engine.dsp index d4b0e4141a..22f8a0105b 100644 --- a/builds/win32/msvc6/engine.dsp +++ b/builds/win32/msvc6/engine.dsp @@ -628,10 +628,6 @@ SOURCE=..\..\..\src\jrd\blf_proto.h # End Source File # Begin Source File -SOURCE=..\..\..\src\jrd\blk.h -# End Source File -# Begin Source File - SOURCE=..\..\..\src\jrd\blob_filter.h # End Source File # Begin Source File diff --git a/builds/win32/msvc6/engine_classic.dsp b/builds/win32/msvc6/engine_classic.dsp index 6369556e57..336d4faab6 100644 --- a/builds/win32/msvc6/engine_classic.dsp +++ b/builds/win32/msvc6/engine_classic.dsp @@ -601,10 +601,6 @@ SOURCE=..\..\..\src\jrd\blf_proto.h # End Source File # Begin Source File -SOURCE=..\..\..\src\jrd\blk.h -# End Source File -# Begin Source File - SOURCE=..\..\..\src\jrd\blob_filter.h # End Source File # Begin Source File diff --git a/builds/win32/msvc6/engine_embed.dsp b/builds/win32/msvc6/engine_embed.dsp index cc260175d3..a65425b0af 100644 --- a/builds/win32/msvc6/engine_embed.dsp +++ b/builds/win32/msvc6/engine_embed.dsp @@ -601,10 +601,6 @@ SOURCE=..\..\..\src\jrd\blf_proto.h # End Source File # Begin Source File -SOURCE=..\..\..\src\jrd\blk.h -# End Source File -# Begin Source File - SOURCE=..\..\..\src\jrd\blob_filter.h # End Source File # Begin Source File diff --git a/builds/win32/msvc7/alice.vcproj b/builds/win32/msvc7/alice.vcproj index 665423d888..b5c91f0889 100644 --- a/builds/win32/msvc7/alice.vcproj +++ b/builds/win32/msvc7/alice.vcproj @@ -171,9 +171,6 @@ - - diff --git a/builds/win32/msvc7/alice_classic.vcproj b/builds/win32/msvc7/alice_classic.vcproj index 85da18ab71..0c023076cf 100644 --- a/builds/win32/msvc7/alice_classic.vcproj +++ b/builds/win32/msvc7/alice_classic.vcproj @@ -170,9 +170,6 @@ - - diff --git a/builds/win32/msvc7/dsql_server.vcproj b/builds/win32/msvc7/dsql_server.vcproj index 69636c5015..a391bf034c 100644 --- a/builds/win32/msvc7/dsql_server.vcproj +++ b/builds/win32/msvc7/dsql_server.vcproj @@ -211,9 +211,6 @@ - - diff --git a/builds/win32/msvc7/dsql_server_classic.vcproj b/builds/win32/msvc7/dsql_server_classic.vcproj index dcfbdd0022..c7b2874f08 100644 --- a/builds/win32/msvc7/dsql_server_classic.vcproj +++ b/builds/win32/msvc7/dsql_server_classic.vcproj @@ -210,9 +210,6 @@ - - diff --git a/builds/win32/msvc7/engine.vcproj b/builds/win32/msvc7/engine.vcproj index 161a8cafd5..b5af110487 100644 --- a/builds/win32/msvc7/engine.vcproj +++ b/builds/win32/msvc7/engine.vcproj @@ -460,9 +460,6 @@ - - diff --git a/builds/win32/msvc7/engine_classic.vcproj b/builds/win32/msvc7/engine_classic.vcproj index dc9b556d70..7bc2e277c3 100644 --- a/builds/win32/msvc7/engine_classic.vcproj +++ b/builds/win32/msvc7/engine_classic.vcproj @@ -460,9 +460,6 @@ - - diff --git a/builds/win32/msvc7/engine_embed.vcproj b/builds/win32/msvc7/engine_embed.vcproj index 687a57e96d..fd5d950ada 100644 --- a/builds/win32/msvc7/engine_embed.vcproj +++ b/builds/win32/msvc7/engine_embed.vcproj @@ -464,9 +464,6 @@ - - diff --git a/builds/win32/msvc8/alice.vcproj b/builds/win32/msvc8/alice.vcproj index 57388bf595..bff563b37e 100644 --- a/builds/win32/msvc8/alice.vcproj +++ b/builds/win32/msvc8/alice.vcproj @@ -1,7 +1,7 @@ @@ -320,10 +320,6 @@ RelativePath="..\..\..\src\alice\alloc.h" > - - diff --git a/builds/win32/msvc8/alice_classic.vcproj b/builds/win32/msvc8/alice_classic.vcproj index 9b55470415..36749c777b 100644 --- a/builds/win32/msvc8/alice_classic.vcproj +++ b/builds/win32/msvc8/alice_classic.vcproj @@ -320,10 +320,6 @@ RelativePath="..\..\..\src\alice\alloc.h" > - - diff --git a/builds/win32/msvc8/dsql_server.vcproj b/builds/win32/msvc8/dsql_server.vcproj index 9f895082ac..28c2276db9 100644 --- a/builds/win32/msvc8/dsql_server.vcproj +++ b/builds/win32/msvc8/dsql_server.vcproj @@ -1,7 +1,7 @@ @@ -376,10 +376,6 @@ RelativePath="..\..\..\src\dsql\array_proto.h" > - - diff --git a/builds/win32/msvc8/dsql_server_classic.vcproj b/builds/win32/msvc8/dsql_server_classic.vcproj index f532ee16a4..646afd97d0 100644 --- a/builds/win32/msvc8/dsql_server_classic.vcproj +++ b/builds/win32/msvc8/dsql_server_classic.vcproj @@ -1,7 +1,7 @@ @@ -376,10 +376,6 @@ RelativePath="..\..\..\src\dsql\array_proto.h" > - - diff --git a/builds/win32/msvc8/engine.vcproj b/builds/win32/msvc8/engine.vcproj index 6ef3a25f35..01dae9b3b1 100644 --- a/builds/win32/msvc8/engine.vcproj +++ b/builds/win32/msvc8/engine.vcproj @@ -1,7 +1,7 @@ @@ -75,6 +75,67 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - @@ -1306,10 +1302,6 @@ RelativePath="..\..\..\src\jrd\RandomGenerator.h" > - - @@ -1342,6 +1334,10 @@ RelativePath="..\..\..\src\jrd\req.h" > + + diff --git a/builds/win32/msvc8/engine_classic.vcproj b/builds/win32/msvc8/engine_classic.vcproj index e4c5aef2b0..5f4212d2c3 100644 --- a/builds/win32/msvc8/engine_classic.vcproj +++ b/builds/win32/msvc8/engine_classic.vcproj @@ -1,7 +1,7 @@ @@ -79,65 +79,6 @@ Name="VCPostBuildEventTool" /> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - @@ -1306,10 +1302,6 @@ RelativePath="..\..\..\src\jrd\RandomGenerator.h" > - - @@ -1342,6 +1334,10 @@ RelativePath="..\..\..\src\jrd\req.h" > + + diff --git a/builds/win32/msvc8/engine_embed.vcproj b/builds/win32/msvc8/engine_embed.vcproj index 3e00687d1f..39a8475a78 100644 --- a/builds/win32/msvc8/engine_embed.vcproj +++ b/builds/win32/msvc8/engine_embed.vcproj @@ -1,7 +1,7 @@ - + @@ -79,65 +79,6 @@ Name="VCPostBuildEventTool" /> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - @@ -1306,10 +1302,6 @@ RelativePath="..\..\..\src\jrd\RandomGenerator.h" > - - @@ -1342,6 +1334,10 @@ RelativePath="..\..\..\src\jrd\req.h" > + + diff --git a/src/alice/blk.h b/src/alice/blk.h deleted file mode 100644 index bf99bc2fca..0000000000 --- a/src/alice/blk.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * PROGRAM: Alice - * MODULE: blk.h - * DESCRIPTION: Block type definitions - * - * The contents of this file are subject to the Interbase Public - * License Version 1.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy - * of the License at http://www.Inprise.com/IPL.html - * - * Software distributed under the License is distributed on an - * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express - * or implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code was created by Inprise Corporation - * and its predecessors. Portions created by Inprise Corporation are - * Copyright (C) Inprise Corporation. - * - * All Rights Reserved. - * Contributor(s): ______________________________________. - */ - -enum alice_blk_t -{ - alice_type_MIN = 0, - alice_type_frb, - alice_type_hnk, - alice_type_plb, - alice_type_vec, - alice_type_vcl, - alice_type_tdr, - alice_type_str, - alice_type_lls, - alice_type_MAX -}; - diff --git a/src/dsql/blk.h b/src/dsql/blk.h deleted file mode 100644 index 376aaeb113..0000000000 --- a/src/dsql/blk.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * PROGRAM: Dynamic SQL runtime support - * MODULE: blk.h - * DESCRIPTION: Block type definitions - * - * The contents of this file are subject to the Interbase Public - * License Version 1.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy - * of the License at http://www.Inprise.com/IPL.html - * - * Software distributed under the License is distributed on an - * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express - * or implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code was created by Inprise Corporation - * and its predecessors. Portions created by Inprise Corporation are - * Copyright (C) Inprise Corporation. - * - * All Rights Reserved. - * Contributor(s): ______________________________________. - */ - -enum dsql_blk_t { - dsql_type_MIN = 0, - dsql_type_ctx, - dsql_type_par, - dsql_type_map, // Unique - dsql_type_req, - dsql_type_dbb, - dsql_type_dsql_rel, - dsql_type_fld, - dsql_type_fil, - dsql_type_nod, - dsql_type_msg, - dsql_type_lls, // linked list stack - dsql_type_str, // random string block - dsql_type_sym, // symbol block - dsql_type_err, - dsql_type_tra, - dsql_type_udf, - dsql_type_var, - dsql_type_blb, - dsql_type_prc, - dsql_type_intlsym, - dsql_type_vec, - dsql_type_imp_join, - dsql_type_MAX -}; - diff --git a/src/jrd/blk.h b/src/jrd/blk.h deleted file mode 100644 index 2fa168dbf8..0000000000 --- a/src/jrd/blk.h +++ /dev/null @@ -1,101 +0,0 @@ -/* - * PROGRAM: JRD Access Method - * MODULE: blk.h - * DESCRIPTION: Block type definitions - * - * The contents of this file are subject to the Interbase Public - * License Version 1.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy - * of the License at http://www.Inprise.com/IPL.html - * - * Software distributed under the License is distributed on an - * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express - * or implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code was created by Inprise Corporation - * and its predecessors. Portions created by Inprise Corporation are - * Copyright (C) Inprise Corporation. - * - * All Rights Reserved. - * Contributor(s): ______________________________________. - */ - -/* In the new memory management code the frb, hnk, and plb types are - * internal to the management implementation, and as such are not given - * types using the general db engine typing scheme. - **/ -// BLKDEF(type_frb, frb, 0) -// BLKDEF(type_hnk, hnk, 0) -// BLKDEF(type_plb, plb, 0) - -BLKDEF(type_vec, vec, sizeof(*((vec*) NULL)->begin())) -BLKDEF(type_dbb, Database, 0) -BLKDEF(type_bcb, BufferControl, sizeof(((BufferControl*) NULL)->bcb_rpt[0])) /* Done 2 */ -BLKDEF(type_bdb, BufferDesc, 0) -BLKDEF(type_pre, Precedence, 0) -BLKDEF(type_lck, Lock, 1) -BLKDEF(type_fil, jrd_file, 1) -BLKDEF(type_pgc, PageControl, 0) -BLKDEF(type_rel, jrd_rel, 0) -BLKDEF(type_fmt, Format, sizeof(((Format*) NULL)->fmt_desc[0])) /* Done */ -BLKDEF(type_vcl, vcl, sizeof(*((vcl*) NULL)->begin())) /* Done */ -BLKDEF(type_req, jrd_req, sizeof(((jrd_req*) NULL)->req_rpb[0])) /* Done */ -BLKDEF(type_tra, jrd_tra, 1) -BLKDEF(type_nod, jrd_nod, sizeof(((jrd_nod*) NULL)->nod_arg[0])) /* Done */ -BLKDEF(type_csb, CompilerScratch, sizeof(((CompilerScratch*) NULL)->csb_rpt[0])) /* Done */ -BLKDEF(type_lls, lls, 0) /* linked list stack */ -BLKDEF(type_rec, Record, 1) /* record parameter */ -BLKDEF(type_rsb, RecordSource, sizeof(((RecordSource*) NULL)->rsb_arg[0])) /* Done record source */ -BLKDEF(type_bms, BitmapSegment, 0) /* bit map segment */ -BLKDEF(type_dfw, DeferredWork, 1) /* deferred work block */ -BLKDEF(type_tfb, TemporaryField, 0) /* temporary field block */ -BLKDEF(type_str, str, 1) /* random string block */ -BLKDEF(type_dcc, DataComprControl, 0) /* data compression control */ -//BLKDEF(type_sbm, SparseBitmap, sizeof(((SparseBitmap*) NULL)->sbm_segments[0])) /* done sparse bit map */ -BLKDEF(type_smb, SortMap, sizeof(((SortMap*) NULL)->smb_rpt[0])) /* done sort map block */ -BLKDEF(type_blb, blb, 1) -BLKDEF(type_irb, IndexRetrieval, sizeof(((IndexRetrieval*) NULL)->irb_value[0])) /* Done Index retrieval */ -BLKDEF(type_scl, SecurityClass, 1) -BLKDEF(type_fld, jrd_fld, 1) -BLKDEF(type_ext, ExternalFile, 1) /* External file */ -BLKDEF(type_mfb, merge_file, 0) /* merge (equivalence) file block */ -BLKDEF(type_riv, River, 1) /* River block -- used in optimizer */ -BLKDEF(type_usr, UserId, 0) /* User identification block */ -BLKDEF(type_att, Jrd::Attachment, 0) /* Database attachment */ -BLKDEF(type_sym, Symbol, 0) -BLKDEF(type_fun, UserFunction, sizeof(((UserFunction*) NULL)->fun_rpt[0])) /* Done Function definition */ -BLKDEF(type_irl, IndexedRelationship, 0) -BLKDEF(type_acc, AccessItem, 0) -BLKDEF(type_idl, IndexLock, 0) -BLKDEF(type_rsc, Resource, 0) -BLKDEF(type_sdw, Shadow, 0) -BLKDEF(type_vct, VerbAction, 0) /* Verb actions */ -BLKDEF(type_blf, BlobFilter, 0) -BLKDEF(type_arr, ArrayField, sizeof(((Ods::InternalArrayDesc*) NULL)->iad_rpt[0])) /* Done, but funny Array description */ -BLKDEF(type_map, blb_map, 0) -BLKDEF(type_log, fblog, 0) -BLKDEF(type_dls, dir_list, 1) -//BLKDEF(type_ail, logfiles, 1) // WAL file. Obsolete. -BLKDEF(type_prc, jrd_prc, 1) /* procedure block */ -BLKDEF(type_prm, Parameter, 1) /* parameter block */ -BLKDEF(type_sav, Savepoint, 0) /* save points */ -BLKDEF(type_xcp, PsqlException, sizeof(((PsqlException*) NULL)->xcp_rpt[0])) /* exception condition list */ -BLKDEF(type_idb, IndexBlock, 0) /* index block for caching index info */ -//BLKDEF(type_bkm, Bookmark, 1) // bookmark block. Obsolete. Used by PC_ENGINE. -BLKDEF(type_tpc, TxPageCache, 1) /* TIP page cache block */ -//BLKDEF(type_rng, RefreshRange, 1) // refresh range. Obsolete. Used by PC_ENGINE for ODAPI support. -BLKDEF(type_svc, Service, 1) /* services */ -BLKDEF(type_lwt, LatchWait, 0) /* latch wait block */ -BLKDEF(type_vcx, ViewContext, 0) /* view context block */ -BLKDEF(type_srpb, SaveRecordParam, 0) /* save record_param block */ -BLKDEF(type_opt, OptimizerBlk, 0) -BLKDEF(type_prf, Prefetch, 0) -BLKDEF(type_rse, RecordSelExpr, 0) -BLKDEF(type_lit, Literal, 0) -BLKDEF(type_asb, AggregateSort, 0) -//BLKDEF(type_srl, srl, 0) // Obsolete, apparently deleted by Sean's cleanup. -BLKDEF(type_ctl, BlobControl, 0) - -BLKDEF(type_PageSpace, PageSpace, 0) -BLKDEF(type_PageManager, PageManager, 0) diff --git a/src/jrd/jrd_blks.h b/src/jrd/jrd_blks.h deleted file mode 100644 index 35ec63771b..0000000000 --- a/src/jrd/jrd_blks.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef JRD_BLKS_H -#define JRD_BLKS_H - -#define BLKDEF(type, root, tail) type, -enum jrd_blk_t { - type_MIN_jrd = 0, -#include "../jrd/blk.h" - type_MAX_jrd -}; -#undef BLKDEF - -#endif // JRD_BLKS_H