mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-23 03:23:04 +01:00
Major cleanup of the old-style blk and allocator-based blk_type.
This commit is contained in:
dimitr
parent
45e2a00234
commit
d637ed09e2
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -171,9 +171,6 @@
|
||||
<File
|
||||
RelativePath="..\..\..\src\alice\alloc.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\alice\blk.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\alice\exe_proto.h">
|
||||
</File>
|
||||
|
||||
@ -170,9 +170,6 @@
|
||||
<File
|
||||
RelativePath="..\..\..\src\alice\alloc.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\alice\blk.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\alice\exe_proto.h">
|
||||
</File>
|
||||
|
||||
@ -211,9 +211,6 @@
|
||||
<File
|
||||
RelativePath="..\..\..\src\dsql\array_proto.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\dsql\blk.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\dsql\blob_proto.h">
|
||||
</File>
|
||||
|
||||
@ -210,9 +210,6 @@
|
||||
<File
|
||||
RelativePath="..\..\..\src\dsql\array_proto.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\dsql\blk.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\dsql\blob_proto.h">
|
||||
</File>
|
||||
|
||||
@ -460,9 +460,6 @@
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\blf_proto.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\blk.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\blob_filter.h">
|
||||
</File>
|
||||
|
||||
@ -460,9 +460,6 @@
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\blf_proto.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\blk.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\blob_filter.h">
|
||||
</File>
|
||||
|
||||
@ -464,9 +464,6 @@
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\blf_proto.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\blk.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\blob_filter.h">
|
||||
</File>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="windows-1251"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="8,00"
|
||||
Version="8.00"
|
||||
Name="alice"
|
||||
ProjectGUID="{0D616380-1A5A-4230-A80B-021360E4E669}"
|
||||
>
|
||||
@ -320,10 +320,6 @@
|
||||
RelativePath="..\..\..\src\alice\alloc.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\alice\blk.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\alice\exe_proto.h"
|
||||
>
|
||||
|
||||
@ -320,10 +320,6 @@
|
||||
RelativePath="..\..\..\src\alice\alloc.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\alice\blk.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\alice\exe_proto.h"
|
||||
>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="windows-1251"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="8,00"
|
||||
Version="8.00"
|
||||
Name="dsql_server"
|
||||
ProjectGUID="{520DF501-5775-44FD-BDC6-37753A17696A}"
|
||||
>
|
||||
@ -376,10 +376,6 @@
|
||||
RelativePath="..\..\..\src\dsql\array_proto.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\dsql\blk.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\dsql\blob_proto.h"
|
||||
>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="windows-1251"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="8,00"
|
||||
Version="8.00"
|
||||
Name="dsql_server_classic"
|
||||
ProjectGUID="{488199DD-D9F3-41C8-AED6-8AFFFB294CFF}"
|
||||
>
|
||||
@ -376,10 +376,6 @@
|
||||
RelativePath="..\..\..\src\dsql\array_proto.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\dsql\blk.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\dsql\blob_proto.h"
|
||||
>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="windows-1251"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="8,00"
|
||||
Version="8.00"
|
||||
Name="engine"
|
||||
ProjectGUID="{F8798A49-9D20-451E-A7BD-FEB5237103B5}"
|
||||
>
|
||||
@ -75,6 +75,67 @@
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|x64"
|
||||
ConfigurationType="4"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2debug.vsprops"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
TargetEnvironment="3"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../extern/icu/include;../../../src/vulcan"
|
||||
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_LIB,SUPERSERVER,DEV_BUILD,NAMESPACE=Vulcan"
|
||||
Detect64BitPortabilityProblems="true"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1049"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
ConfigurationType="4"
|
||||
@ -138,67 +199,6 @@
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|x64"
|
||||
ConfigurationType="4"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2debug.vsprops"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
TargetEnvironment="3"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../extern/icu/include;../../../src/vulcan"
|
||||
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_LIB,SUPERSERVER,DEV_BUILD,NAMESPACE=Vulcan"
|
||||
Detect64BitPortabilityProblems="true"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1049"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|x64"
|
||||
ConfigurationType="4"
|
||||
@ -714,10 +714,6 @@
|
||||
RelativePath="..\..\..\src\jrd\blf_proto.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\blk.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\blob_filter.h"
|
||||
>
|
||||
@ -1306,10 +1302,6 @@
|
||||
RelativePath="..\..\..\src\jrd\RandomGenerator.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\ResultSet.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\rdb.h"
|
||||
>
|
||||
@ -1342,6 +1334,10 @@
|
||||
RelativePath="..\..\..\src\jrd\req.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\ResultSet.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\rlck_proto.h"
|
||||
>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="windows-1251"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="8,00"
|
||||
Version="8.00"
|
||||
Name="engine_classic"
|
||||
ProjectGUID="{E029E4E2-0C3F-4F7D-BC4C-D9C20F40EB4E}"
|
||||
>
|
||||
@ -79,65 +79,6 @@
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
ConfigurationType="4"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2debug.vsprops"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../extern/icu/include;../../../src/vulcan"
|
||||
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_LIB,DEV_BUILD,NAMESPACE=Vulcan"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1049"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|x64"
|
||||
ConfigurationType="4"
|
||||
@ -202,6 +143,65 @@
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
ConfigurationType="4"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2debug.vsprops"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../extern/icu/include;../../../src/vulcan"
|
||||
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_LIB,DEV_BUILD,NAMESPACE=Vulcan"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1049"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|x64"
|
||||
ConfigurationType="4"
|
||||
@ -714,10 +714,6 @@
|
||||
RelativePath="..\..\..\src\jrd\blf_proto.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\blk.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\blob_filter.h"
|
||||
>
|
||||
@ -1306,10 +1302,6 @@
|
||||
RelativePath="..\..\..\src\jrd\RandomGenerator.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\ResultSet.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\rdb.h"
|
||||
>
|
||||
@ -1342,6 +1334,10 @@
|
||||
RelativePath="..\..\..\src\jrd\req.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\ResultSet.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\rlck_proto.h"
|
||||
>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<?xml version="1.0" encoding="windows-1251"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="8,00"
|
||||
Version="8.00"
|
||||
Name="engine_embed"
|
||||
ProjectGUID="{F55ACA54-70DF-4343-8E16-FA97C757CCF6}"
|
||||
>
|
||||
@ -79,65 +79,6 @@
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
ConfigurationType="4"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2debug.vsprops"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../extern/icu/include;../../../src/vulcan"
|
||||
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_LIB,SUPERSERVER,DEV_BUILD,EMBEDDED,NAMESPACE=Vulcan"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1049"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|x64"
|
||||
ConfigurationType="4"
|
||||
@ -202,6 +143,65 @@
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
ConfigurationType="4"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops;.\firebird2.vsprops;.\firebird2debug.vsprops"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="../../../src/include;../../../src/include/gen;../../../extern/icu/include;../../../src/vulcan"
|
||||
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,_LIB,SUPERSERVER,DEV_BUILD,EMBEDDED,NAMESPACE=Vulcan"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1049"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|x64"
|
||||
ConfigurationType="4"
|
||||
@ -718,10 +718,6 @@
|
||||
RelativePath="..\..\..\src\jrd\blf_proto.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\blk.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\blob_filter.h"
|
||||
>
|
||||
@ -1306,10 +1302,6 @@
|
||||
RelativePath="..\..\..\src\jrd\RandomGenerator.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\ResultSet.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\rdb.h"
|
||||
>
|
||||
@ -1342,6 +1334,10 @@
|
||||
RelativePath="..\..\..\src\jrd\req.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\ResultSet.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\src\jrd\rlck_proto.h"
|
||||
>
|
||||
|
||||
@ -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
|
||||
};
|
||||
|
||||
@ -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
|
||||
};
|
||||
|
||||
101
src/jrd/blk.h
101
src/jrd/blk.h
@ -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<void**>*) 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)
|
||||
@ -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
|
||||
Loading…
Reference in New Issue
Block a user