diff --git a/builds/mac_os_x/CS/CS.pbproj/project.pbxproj b/builds/mac_os_x/CS/CS.pbproj/project.pbxproj
index eec3887b73..f6515ad237 100644
--- a/builds/mac_os_x/CS/CS.pbproj/project.pbxproj
+++ b/builds/mac_os_x/CS/CS.pbproj/project.pbxproj
@@ -4161,6 +4161,11 @@
path = dsc.h;
refType = 4;
};
+ F616C5B60200B0CF01EF0ADE = {
+ isa = PBXFileReference;
+ path = dsc_pub.h;
+ refType = 4;
+ };
F616C5B70200B0CF01EF0ADE = {
isa = PBXFileReference;
path = dsc_proto.h;
@@ -4553,7 +4558,7 @@
};
F616C60A0200B0CF01EF0ADE = {
isa = PBXFileReference;
- path = inf.h;
+ path = inf_pub.h;
refType = 4;
};
F616C60B0200B0CF01EF0ADE = {
diff --git a/builds/mac_os_x/CS/Helpers.make b/builds/mac_os_x/CS/Helpers.make
index 46e78f5ec4..dd8e0cc048 100644
--- a/builds/mac_os_x/CS/Helpers.make
+++ b/builds/mac_os_x/CS/Helpers.make
@@ -361,7 +361,7 @@ fw_files_:
headers_:
-mkdir -p $(FB_FW)/Versions/A/Headers
echo "#ifndef IBASE_H" > $(FW)/Headers/ibase.h
- cat $(SRC_ROOT)/include/fb_types.h $(SRC_ROOT)/dsql/sqlda_pub.h $(SRC_ROOT)/jrd/ibase.h $(SRC_ROOT)/include/gen/iberror.h $(SRC_ROOT)/jrd/blr.h $(SRC_ROOT)/include/gen/codes.h | grep -v "#include" >> $(FW)/Headers/ibase.h
+ cat $(SRC_ROOT)/include/fb_types.h $(SRC_ROOT)/jrd/sqlda_pub.h $(SRC_ROOT)/dsql/dsc_pub.h $(SRC_ROOT)/jrd/ibase.h $(SRC_ROOT)/jrd/inf_pub.h $(SRC_ROOT)/include/gen/iberror.h $(SRC_ROOT)/jrd/blr.h $(SRC_ROOT)/include/gen/codes.h | grep -v "#include" >> $(FW)/Headers/ibase.h
echo "#endif /*IBASE_H*/" >> $(FW)/Headers/ibase.h
headers_clean:
diff --git a/builds/posix/Makefile.in.firebird b/builds/posix/Makefile.in.firebird
index 4baa0b71af..bdda5fbcd0 100644
--- a/builds/posix/Makefile.in.firebird
+++ b/builds/posix/Makefile.in.firebird
@@ -27,7 +27,7 @@
# Contributor(s):
#
#
-# $Id: Makefile.in.firebird,v 1.53 2004-04-30 23:02:06 brodsom Exp $
+# $Id: Makefile.in.firebird,v 1.54 2004-05-07 11:19:53 brodsom Exp $
#
ROOT=..
@@ -432,7 +432,7 @@ include_generic: $(INCLUDE_DEST)/ib_util.h \
# All these files are #includes in ibase.h here we cat them all together
# and remove the embedded #includes to make it simpler for external usage.
-IBASE_ExtraFiles = include/fb_types.h dsql/sqlda_pub.h jrd/ibase.h jrd/blr.h include/gen/iberror.h
+IBASE_ExtraFiles = include/fb_types.h dsql/sqlda_pub.h jrd/dsc_pub.h jrd/ibase.h jrd/inf_pub.h jrd/blr.h include/gen/iberror.h
SRC_IBASE_ExtraFiles = $(addprefix $(SRC_ROOT)/, $(IBASE_ExtraFiles))
$(INCLUDE_DEST)/ibase.h: $(SRC_IBASE_ExtraFiles)
diff --git a/builds/win32/make_all.bat b/builds/win32/make_all.bat
index 8f30b21433..cc00484411 100644
--- a/builds/win32/make_all.bat
+++ b/builds/win32/make_all.bat
@@ -104,7 +104,9 @@ goto :EOF
copy %ROOT_PATH%\src\misc\ibase_header.txt %ROOT_PATH%\output\include\ibase.tmp > nul
type %ROOT_PATH%\src\include\fb_types.h >> %ROOT_PATH%\output\include\ibase.tmp
type %ROOT_PATH%\src\dsql\sqlda_pub.h >> %ROOT_PATH%\output\include\ibase.tmp
+type %ROOT_PATH%\src\jrd\dsc_pub.h >> %ROOT_PATH%\output\include\ibase.tmp
type %ROOT_PATH%\src\jrd\ibase.h >> %ROOT_PATH%\output\include\ibase.tmp
+type %ROOT_PATH%\src\jrd\inf_pub.h.h >> %ROOT_PATH%\output\include\ibase.tmp
type %ROOT_PATH%\src\jrd\blr.h >> %ROOT_PATH%\output\include\ibase.tmp
type %ROOT_PATH%\src\include\gen\iberror.h >> %ROOT_PATH%\output\include\ibase.tmp
sed -f %ROOT_PATH%\src\misc\headers.sed < %ROOT_PATH%\output\include\ibase.tmp > %ROOT_PATH%\output\include\ibase.h
diff --git a/builds/win32/msvc6/engine.dsp b/builds/win32/msvc6/engine.dsp
index 40900be41c..73fc9a2cbe 100644
--- a/builds/win32/msvc6/engine.dsp
+++ b/builds/win32/msvc6/engine.dsp
@@ -701,6 +701,10 @@ SOURCE=..\..\..\src\jrd\dsc.h
# End Source File
# Begin Source File
+SOURCE=..\..\..\src\jrd\dsc_pub.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\src\jrd\dsc_proto.h
# End Source File
# Begin Source File
@@ -861,7 +865,7 @@ SOURCE=..\..\..\src\jrd\idx_proto.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\src\jrd\inf.h
+SOURCE=..\..\..\src\jrd\inf_pub.h
# End Source File
# Begin Source File
diff --git a/builds/win32/msvc6/engine_classic.dsp b/builds/win32/msvc6/engine_classic.dsp
index 0fe2f6bad3..d28a428532 100644
--- a/builds/win32/msvc6/engine_classic.dsp
+++ b/builds/win32/msvc6/engine_classic.dsp
@@ -670,6 +670,10 @@ SOURCE=..\..\..\src\jrd\dsc.h
# End Source File
# Begin Source File
+SOURCE=..\..\..\src\jrd\dsc_pub.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\src\jrd\dsc_proto.h
# End Source File
# Begin Source File
@@ -830,7 +834,7 @@ SOURCE=..\..\..\src\jrd\idx_proto.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\src\jrd\inf.h
+SOURCE=..\..\..\src\jrd\inf_pub.h
# End Source File
# Begin Source File
diff --git a/builds/win32/msvc6/engine_embed.dsp b/builds/win32/msvc6/engine_embed.dsp
index f64cefb646..5fae8576de 100644
--- a/builds/win32/msvc6/engine_embed.dsp
+++ b/builds/win32/msvc6/engine_embed.dsp
@@ -670,6 +670,10 @@ SOURCE=..\..\..\src\jrd\dsc.h
# End Source File
# Begin Source File
+SOURCE=..\..\..\src\jrd\dsc_pub.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\src\jrd\dsc_proto.h
# End Source File
# Begin Source File
@@ -830,7 +834,7 @@ SOURCE=..\..\..\src\jrd\idx_proto.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\src\jrd\inf.h
+SOURCE=..\..\..\src\jrd\inf_pub.h
# End Source File
# Begin Source File
diff --git a/builds/win32/msvc6/fbclient.dsp b/builds/win32/msvc6/fbclient.dsp
index 91d1a76c75..bb6e710be9 100644
--- a/builds/win32/msvc6/fbclient.dsp
+++ b/builds/win32/msvc6/fbclient.dsp
@@ -296,6 +296,10 @@ SOURCE=..\..\..\src\jrd\dsc.h
# End Source File
# Begin Source File
+SOURCE=..\..\..\src\jrd\dsc_pub.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\src\jrd\enc_proto.h
# End Source File
# Begin Source File
diff --git a/builds/win32/msvc6/fbclient_static.dsp b/builds/win32/msvc6/fbclient_static.dsp
index 0def77feae..df01579b68 100644
--- a/builds/win32/msvc6/fbclient_static.dsp
+++ b/builds/win32/msvc6/fbclient_static.dsp
@@ -109,6 +109,10 @@ SOURCE=..\..\..\src\jrd\dsc.h
# End Source File
# Begin Source File
+SOURCE=..\..\..\src\jrd\dsc_pub.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\src\jrd\enc_proto.h
# End Source File
# Begin Source File
diff --git a/builds/win32/msvc6/gpre.dsp b/builds/win32/msvc6/gpre.dsp
index d1b336fee7..1928ba1532 100644
--- a/builds/win32/msvc6/gpre.dsp
+++ b/builds/win32/msvc6/gpre.dsp
@@ -198,6 +198,10 @@ SOURCE=..\..\..\src\jrd\dsc.h
# End Source File
# Begin Source File
+SOURCE=..\..\..\src\jrd\dsc_pub.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\src\jrd\isc.cpp
# End Source File
# End Group
diff --git a/builds/win32/msvc6/gpre_boot.dsp b/builds/win32/msvc6/gpre_boot.dsp
index c6ef8b696e..44ff78c345 100644
--- a/builds/win32/msvc6/gpre_boot.dsp
+++ b/builds/win32/msvc6/gpre_boot.dsp
@@ -186,6 +186,10 @@ SOURCE=..\..\..\src\jrd\dsc.h
# End Source File
# Begin Source File
+SOURCE=..\..\..\src\jrd\dsc_pub.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\src\jrd\gds.cpp
# End Source File
# Begin Source File
diff --git a/builds/win32/msvc6/gpre_static.dsp b/builds/win32/msvc6/gpre_static.dsp
index 04cf5273da..5d01f9fd7e 100644
--- a/builds/win32/msvc6/gpre_static.dsp
+++ b/builds/win32/msvc6/gpre_static.dsp
@@ -198,6 +198,10 @@ SOURCE=..\..\..\src\jrd\dsc.h
# End Source File
# Begin Source File
+SOURCE=..\..\..\src\jrd\dsc_pub.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\src\jrd\isc.cpp
# End Source File
# End Group
diff --git a/builds/win32/msvc7/engine.vcproj b/builds/win32/msvc7/engine.vcproj
index 523d3fb384..ac5082541c 100644
--- a/builds/win32/msvc7/engine.vcproj
+++ b/builds/win32/msvc7/engine.vcproj
@@ -547,6 +547,9 @@
+
+
@@ -668,7 +671,7 @@
RelativePath="..\..\..\src\jrd\idx_proto.h">
+ RelativePath="..\..\..\src\jrd\inf_pub.h">
diff --git a/builds/win32/msvc7/engine_classic.vcproj b/builds/win32/msvc7/engine_classic.vcproj
index e8c16094ae..1e34d83c91 100644
--- a/builds/win32/msvc7/engine_classic.vcproj
+++ b/builds/win32/msvc7/engine_classic.vcproj
@@ -544,6 +544,9 @@
+
+
@@ -665,7 +668,7 @@
RelativePath="..\..\..\src\jrd\idx_proto.h">
+ RelativePath="..\..\..\src\jrd\inf_pub.h">
diff --git a/builds/win32/msvc7/engine_embed.vcproj b/builds/win32/msvc7/engine_embed.vcproj
index 03bd2242a9..7cf7709a09 100644
--- a/builds/win32/msvc7/engine_embed.vcproj
+++ b/builds/win32/msvc7/engine_embed.vcproj
@@ -544,6 +544,9 @@
+
+
@@ -665,7 +668,7 @@
RelativePath="..\..\..\src\jrd\idx_proto.h">
+ RelativePath="..\..\..\src\jrd\inf_pub.h">
diff --git a/builds/win32/msvc7/fbclient.vcproj b/builds/win32/msvc7/fbclient.vcproj
index 9e136ad6ea..07d7984d25 100644
--- a/builds/win32/msvc7/fbclient.vcproj
+++ b/builds/win32/msvc7/fbclient.vcproj
@@ -297,6 +297,9 @@
+
+
diff --git a/builds/win32/msvc7/fbclient_static.vcproj b/builds/win32/msvc7/fbclient_static.vcproj
index e0280114cf..5b0f89e68b 100644
--- a/builds/win32/msvc7/fbclient_static.vcproj
+++ b/builds/win32/msvc7/fbclient_static.vcproj
@@ -149,6 +149,9 @@
+
+
diff --git a/builds/win32/msvc7/gpre.vcproj b/builds/win32/msvc7/gpre.vcproj
index 53bdda21af..1d8b51513e 100644
--- a/builds/win32/msvc7/gpre.vcproj
+++ b/builds/win32/msvc7/gpre.vcproj
@@ -230,6 +230,9 @@
+
+
diff --git a/builds/win32/msvc7/gpre_boot.vcproj b/builds/win32/msvc7/gpre_boot.vcproj
index 17cdf03054..8a6aa3d37e 100644
--- a/builds/win32/msvc7/gpre_boot.vcproj
+++ b/builds/win32/msvc7/gpre_boot.vcproj
@@ -219,6 +219,9 @@
+
+
diff --git a/builds/win32/msvc7/gpre_static.vcproj b/builds/win32/msvc7/gpre_static.vcproj
index e7cd60dfd1..d7a13100db 100644
--- a/builds/win32/msvc7/gpre_static.vcproj
+++ b/builds/win32/msvc7/gpre_static.vcproj
@@ -226,6 +226,9 @@
+
+
diff --git a/src/misc/headers.sed b/src/misc/headers.sed
index 83bc764e04..192bfa3042 100644
--- a/src/misc/headers.sed
+++ b/src/misc/headers.sed
@@ -2,3 +2,6 @@ s/#include "fb_types.h"//g
s/#include "blr.h"//g
s/#include "iberror.h"//g
s/#include "codes.h"//g
+s/#include "sqlda_pub.h"//g
+s/#include "inf_pub.h"//g
+s/#include "dsc_pub.h"//g