firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 10:40:38 +01:00
Code Issues

Refactor public include files (#205)

Browse Source 
Refactor include files.
This commit is contained in:
Adriano dos Santos Fernandes 2019-06-03 11:45:00 -03:00 committed by GitHub
parent c209b910e9
commit 45d5e3aa7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
178 changed files with 1579 additions and 2066 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
builds/install/arch-specific/win32/BuildExecutableInstall.bat
View File

@ -425,39 +425,6 @@ if %MSVC_VERSION% EQU 15 (
@goto :EOF @goto :EOF
:IBASE_H
:: Concatenate header files into ibase.h
::======================================
:: o This section of code takes several header files, strips license
:: boiler plates and comments and inserts them into ibase.h for
:: distribution. The only drawback is that it strips all the comments.
:: o No error checking is done.
:: o Take note that different versions of sed use different
:: string delimiters. The firebird_tools version uses double quotes - ".
:: The cygwin one probably uses single quotes.
:: o The script 'strip_comments.sed' is taken from
:: http://sed.sourceforge.net/grabbag/scripts/testo.htm
setlocal
set OUTPATH=%FB_OUTPUT_DIR%\include
copy %FB_ROOT_PATH%\src\jrd\ibase.h %OUTPATH%\ibase.h > nul
for %%v in ( %FB_ROOT_PATH%\src\include\types_pub.h %FB_ROOT_PATH%\src\include\consts_pub.h %FB_ROOT_PATH%\src\dsql\sqlda_pub.h %FB_ROOT_PATH%\src\common\dsc_pub.h %FB_ROOT_PATH%\src\jrd\inf_pub.h %FB_ROOT_PATH%\src\jrd\blr.h ) do (
del %OUTPATH%\%%~nxv 2> nul
copy %%v %OUTPATH%\%%~nxv > nul
sed -n -f strip_comments.sed %OUTPATH%\%%~nxv > %OUTPATH%\%%~nv.more || call :ERROR Stripping comments from %%v failed.
more /s %OUTPATH%\%%~nv.more > %OUTPATH%\%%~nv.sed
)
move /y %OUTPATH%\ibase.h %OUTPATH%\ibase.sed
sed -e "/#include \"types_pub\.h\"/r %OUTPATH%\types_pub.sed" -e "/#include \"types_pub\.h\"/d" -e "/#include \"consts_pub\.h\"/r %OUTPATH%\consts_pub.sed" -e "/#include \"consts_pub\.h\"/d" -e "/#include \"..\/common\/dsc_pub\.h\"/r %OUTPATH%\dsc_pub.sed" -e "/#include \"..\/common\/dsc_pub\.h\"/d" -e "/#include \"..\/dsql\/sqlda_pub\.h\"/r %OUTPATH%\sqlda_pub.sed" -e "/#include \"..\/dsql\/sqlda_pub\.h\"/d" -e "/#include \"blr\.h\"/r %OUTPATH%\blr.sed" -e "/#include \"blr\.h\"/d" -e "/#include \"..\/jrd\/inf_pub\.h\"/r %OUTPATH%\inf_pub.sed" -e "/#include \"..\/jrd\/inf_pub\.h\"/d" %OUTPATH%\ibase.sed > %OUTPATH%\ibase.h
del %OUTPATH%\ibase.sed %OUTPATH%\types_pub.* %OUTPATH%\consts_pub.* %OUTPATH%\sqlda_pub.* %OUTPATH%\dsc_pub.* %OUTPATH%\inf_pub.* %OUTPATH%\blr.*
endlocal
::End of IBASE_H
::--------------
@goto :EOF
:INCLUDE_DIR :INCLUDE_DIR
:: Prepare other files needed for deployment to /include dir :: Prepare other files needed for deployment to /include dir
setlocal setlocal
@ -791,10 +758,6 @@ if defined WIX (
@echo. @echo.
) )
@echo Concatenating header files for ibase.h
@(@call :IBASE_H ) || (@echo Error calling IBASE_H && @goto :END)
@echo.
@echo Prepare include directory @echo Prepare include directory
@(@call :INCLUDE_DIR ) || (@echo Error calling INCLUDE_DIR && @goto :END) @(@call :INCLUDE_DIR ) || (@echo Error calling INCLUDE_DIR && @goto :END)
@echo. @echo.

82
builds/install/arch-specific/win32/strip_comments.sed
View File

@ -1,82 +0,0 @@
: loop
/^\/\// s,.*,,
/^$/{
x
p
n
b loop
}
/^"/{
: double
/^$/{
x
p
n
/^"/b break
b double
}
H
x
s,\n\(.[^\"]*\).*,\1,
x
s,.[^\"]*,,
/^"/b break
/^\\/{
H
x
s,\n\(.\).*,\1,
x
s/.//
}
b double
}
/^'/{
: single
/^$/{
x
p
n
/^'/b break
b single
}
H
x
s,\n\(.[^\']*\).*,\1,
x
s,.[^\']*,,
/^'/b break
/^\\/{
H
x
s,\n\(.\).*,\1,
x
s/.//
}
b single
}
/^\/\*/{
s/.//
: ccom
s,^.[^*]*,,
/^$/ n
/^\*\//{
s/..//
b loop
}
b ccom
}
: break
H
x
s,\n\(.[^"'/]*\).*,\1,
x
s/.[^"'/]*//
b loop

22
builds/posix/Makefile.in
View File

@ -102,7 +102,7 @@ API_PAS_FILE=$(SRC_ROOT)/include/gen/Firebird.pas
PAS_ROOT=$(SRC_ROOT)/misc/pascal PAS_ROOT=$(SRC_ROOT)/misc/pascal
PASCAL_SOURCES=$(wildcard $(PAS_ROOT)/*) PASCAL_SOURCES=$(wildcard $(PAS_ROOT)/*)
TMP_FUNCS=$(TMP_ROOT)/func.pas TMP_FUNCS=$(TMP_ROOT)/func.pas
XPB_CONSTS=$(SRC_ROOT)/include/consts_pub.h XPB_CONSTS=$(SRC_ROOT)/include/firebird/impl/consts_pub.h
ERR_CONSTS=$(ROOT)/lang_helpers/gds_codes.pas ERR_CONSTS=$(ROOT)/lang_helpers/gds_codes.pas
updateCloopInterfaces : $(API_H_FILE) $(API_PAS_FILE) updateCloopInterfaces : $(API_H_FILE) $(API_PAS_FILE)
@ -646,31 +646,17 @@ NEW_INCLUDES_SRC = $(shell find $(SRC_ROOT)/include/firebird -type f)
NEW_INCLUDES_DEST = $(patsubst $(SRC_ROOT)/include/firebird/%, $(INCLUDE_DEST)/firebird/%, $(NEW_INCLUDES_SRC)) NEW_INCLUDES_DEST = $(patsubst $(SRC_ROOT)/include/firebird/%, $(INCLUDE_DEST)/firebird/%, $(NEW_INCLUDES_SRC))
include_generic: $(INCLUDE_DEST)/ib_util.h \ include_generic: $(INCLUDE_DEST)/ib_util.h \
$(INCLUDE_DEST)/ibase.h \
$(NEW_INCLUDES_DEST) $(NEW_INCLUDES_DEST)
# ib_util.h actually is a marker for a number of headers # ib_util.h actually is a marker for a number of headers
# All these files are #included in ibase.h. Here we cat them all together
# and remove the embedded #includes to make it simpler for external usage.
IBASE_ExtraFiles = include/types_pub.h include/consts_pub.h dsql/sqlda_pub.h common/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))
MAKE_HEADER_Src = $(addprefix $(SRC_ROOT)/, misc/makeHeader.cpp)
MAKE_HEADER_Bin = ./makeHeader
$(INCLUDE_DEST)/ibase.h: $(SRC_IBASE_ExtraFiles)
$(STATICEXE_LINK) -o $(MAKE_HEADER_Bin) $(MAKE_HEADER_Src)
$(CP) $^ .
$(MAKE_HEADER_Bin) <ibase.h >$@
$(RM) -f ibase.h
# Copy all the other headers to the distribution directory. We use # Copy all the other headers to the distribution directory. We use
# ib_util.h as the marker for all the files. # ib_util.h as the marker for all the files.
OtherDistribHeaders = extlib/ib_util.h \ OtherDistribHeaders = extlib/ib_util.h \
yvalve/perf.h \ yvalve/perf.h \
include/gen/iberror.h include/gen/iberror.h \
include/ibase.h
SRC_OtherDistribHeaders = $(addprefix $(SRC_ROOT)/, $(OtherDistribHeaders)) SRC_OtherDistribHeaders = $(addprefix $(SRC_ROOT)/, $(OtherDistribHeaders))
@ -719,7 +705,7 @@ clean_vers:
$(RM) *.vers $(RM) *.vers
clean_misc: clean_misc:
$(RM) makeHeader ods.txt odstest* security.tmp test.header.txt $(RM) ods.txt odstest* security.tmp test.header.txt
ifeq ($(EDITLINE_FLG),Y) ifeq ($(EDITLINE_FLG),Y)
ifeq ($(STD_EDITLINE),false) ifeq ($(STD_EDITLINE),false)

21
builds/win32/make_all.bat
View File

@ -84,26 +84,7 @@ findstr /V "@UDF_COMMENT@" %FB_ROOT_PATH%\builds\install\misc\firebird.conf.in >
@copy %FB_ROOT_PATH%\doc\README.* %FB_OUTPUT_DIR%\doc >nul @copy %FB_ROOT_PATH%\doc\README.* %FB_OUTPUT_DIR%\doc >nul
@copy %FB_ROOT_PATH%\doc\sql.extensions\README.* %FB_OUTPUT_DIR%\doc\sql.extensions >nul @copy %FB_ROOT_PATH%\doc\sql.extensions\README.* %FB_OUTPUT_DIR%\doc\sql.extensions >nul
:: HEADERS :: Headers
:: Don't use this ibase.h unless you have to - we build it better in BuildExecutableInstall.bat
:: This variation doesn't clean up the license templates, and processes the component files in
:: a different order to that used in the production version. However, this version doesn't
:: have a dependancy upon sed while the production one does.
echo #pragma message("Non-production version of ibase.h.") > %FB_OUTPUT_DIR%\include\ibase.tmp
echo #pragma message("Using raw, unprocessed concatenation of header files.") >> %FB_OUTPUT_DIR%\include\ibase.tmp
type %FB_ROOT_PATH%\src\misc\ibase_header.txt >> %FB_OUTPUT_DIR%\include\ibase.tmp
type %FB_ROOT_PATH%\src\include\types_pub.h >> %FB_OUTPUT_DIR%\include\ibase.tmp
type %FB_ROOT_PATH%\src\common\dsc_pub.h >> %FB_OUTPUT_DIR%\include\ibase.tmp
type %FB_ROOT_PATH%\src\dsql\sqlda_pub.h >> %FB_OUTPUT_DIR%\include\ibase.tmp
type %FB_ROOT_PATH%\src\jrd\ibase.h >> %FB_OUTPUT_DIR%\include\ibase.tmp
type %FB_ROOT_PATH%\src\jrd\inf_pub.h >> %FB_OUTPUT_DIR%\include\ibase.tmp
type %FB_ROOT_PATH%\src\include\consts_pub.h >> %FB_OUTPUT_DIR%\include\ibase.tmp
type %FB_ROOT_PATH%\src\jrd\blr.h >> %FB_OUTPUT_DIR%\include\ibase.tmp
type %FB_ROOT_PATH%\src\include\gen\iberror.h >> %FB_OUTPUT_DIR%\include\ibase.tmp
sed -f %FB_ROOT_PATH%\src\misc\headers.sed < %FB_OUTPUT_DIR%\include\ibase.tmp > %FB_OUTPUT_DIR%\include\ibase.h
del %FB_OUTPUT_DIR%\include\ibase.tmp > nul
:: Additional headers
copy %FB_ROOT_PATH%\src\extlib\ib_util.h %FB_OUTPUT_DIR%\include > nul copy %FB_ROOT_PATH%\src\extlib\ib_util.h %FB_OUTPUT_DIR%\include > nul
copy %FB_ROOT_PATH%\src\jrd\perf.h %FB_OUTPUT_DIR%\include >nul copy %FB_ROOT_PATH%\src\jrd\perf.h %FB_OUTPUT_DIR%\include >nul
copy %FB_ROOT_PATH%\src\include\gen\iberror.h %FB_OUTPUT_DIR%\include > nul copy %FB_ROOT_PATH%\src\include\gen\iberror.h %FB_OUTPUT_DIR%\include > nul

2
src/alice/alice.cpp
View File

@ -40,7 +40,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include "../jrd/ibase.h" #include "ibase.h"
#include "../jrd/license.h" #include "../jrd/license.h"
#include "../alice/alice.h" #include "../alice/alice.h"
#include "../alice/exe_proto.h" #include "../alice/exe_proto.h"

2
src/alice/alice.h
View File

@ -26,7 +26,7 @@
#include <stdio.h> #include <stdio.h>
#include "../jrd/ibase.h" #include "ibase.h"
#include "../common/ThreadData.h" #include "../common/ThreadData.h"
#include "../include/fb_blk.h" #include "../include/fb_blk.h"
#include "../common/classes/alloc.h" #include "../common/classes/alloc.h"

2
src/alice/alice_meta.epp
View File

@ -29,7 +29,7 @@
#include "firebird.h" #include "firebird.h"
#include <stdio.h> #include <stdio.h>
#include "../jrd/ibase.h" #include "ibase.h"
#include "../alice/alice.h" #include "../alice/alice.h"
#include "../alice/alice_meta.h" #include "../alice/alice_meta.h"
#include "../yvalve/gds_proto.h" #include "../yvalve/gds_proto.h"

2
src/alice/aliceswi.h
View File

@ -22,7 +22,7 @@
#ifndef ALICE_ALICESWI_H #ifndef ALICE_ALICESWI_H
#define ALICE_ALICESWI_H #define ALICE_ALICESWI_H
#include "../jrd/ibase.h" #include "ibase.h"
#include "../jrd/constants.h" #include "../jrd/constants.h"
// switch definitions // switch definitions

2
src/alice/exe.cpp
View File

@ -36,7 +36,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "../jrd/ibase.h" #include "ibase.h"
#include "../alice/alice.h" #include "../alice/alice.h"
#include "../alice/alice_proto.h" #include "../alice/alice_proto.h"
#include "../common/classes/Switches.h" #include "../common/classes/Switches.h"

2
src/alice/tdr.cpp
View File

@ -35,7 +35,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "memory_routines.h" #include "memory_routines.h"
#include "../jrd/ibase.h" #include "ibase.h"
#include "../alice/alice.h" #include "../alice/alice.h"
#include "../common/classes/Switches.h" #include "../common/classes/Switches.h"
#include "../alice/aliceswi.h" #include "../alice/aliceswi.h"

2
src/auth/AuthDbg.cpp
View File

@ -27,7 +27,7 @@
#include "firebird.h" #include "firebird.h"
#include "../auth/AuthDbg.h" #include "../auth/AuthDbg.h"
#include "../jrd/ibase.h" #include "ibase.h"
#include "../common/StatusHolder.h" #include "../common/StatusHolder.h"
#ifdef AUTH_DEBUG #ifdef AUTH_DEBUG

2
src/auth/SecureRemotePassword/Message.h
View File

@ -9,7 +9,7 @@
#include "../common/classes/alloc.h" #include "../common/classes/alloc.h"
#include "../common/StatusHolder.h" #include "../common/StatusHolder.h"
#include "../common/classes/ImplementHelper.h" #include "../common/classes/ImplementHelper.h"
#include "../dsql/sqlda_pub.h" #include "firebird/impl/sqlda_pub.h"
#else // INTERNAL_FIREBIRD #else // INTERNAL_FIREBIRD

2
src/auth/SecureRemotePassword/manage/SrpManagement.cpp
View File

@ -32,7 +32,7 @@
#include "firebird/Interface.h" #include "firebird/Interface.h"
#include "../auth/SecureRemotePassword/srp.h" #include "../auth/SecureRemotePassword/srp.h"
#include "../jrd/constants.h" #include "../jrd/constants.h"
#include "../jrd/inf_pub.h" #include "firebird/impl/inf_pub.h"
#include "../utilities/gsec/gsec.h" #include "../utilities/gsec/gsec.h"
#include "../auth/SecureRemotePassword/Message.h" #include "../auth/SecureRemotePassword/Message.h"
#include "../common/classes/auto.h" #include "../common/classes/auto.h"

2
src/auth/SecurityDatabase/LegacyClient.cpp
View File

@ -26,7 +26,7 @@
* *
*/ */
#include "firebird.h" #include "firebird.h"
#include "../jrd/ibase.h" #include "ibase.h"
#include "../auth/SecurityDatabase/LegacyClient.h" #include "../auth/SecurityDatabase/LegacyClient.h"
#include "../auth/SecurityDatabase/LegacyHash.h" #include "../auth/SecurityDatabase/LegacyHash.h"
#include "../common/enc_proto.h" #include "../common/enc_proto.h"

2
src/auth/SecurityDatabase/LegacyManagement.epp
View File

@ -27,7 +27,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include "../jrd/ibase.h" #include "ibase.h"
#include "../auth/SecurityDatabase/LegacyHash.h" #include "../auth/SecurityDatabase/LegacyHash.h"
#include "../common/enc_proto.h" #include "../common/enc_proto.h"
#include "../yvalve/gds_proto.h" #include "../yvalve/gds_proto.h"

2
src/auth/SecurityDatabase/LegacyServer.cpp
View File

@ -27,7 +27,7 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
#include "../jrd/ibase.h" #include "ibase.h"
#include "../auth/SecurityDatabase/LegacyServer.h" #include "../auth/SecurityDatabase/LegacyServer.h"
#include "../auth/SecurityDatabase/LegacyHash.h" #include "../auth/SecurityDatabase/LegacyHash.h"
#include "../common/enc_proto.h" #include "../common/enc_proto.h"

2
src/auth/SecurityDatabase/LegacyServer.h
View File

@ -27,7 +27,7 @@
#ifndef AUTH_LEGACY_SERVER_H #ifndef AUTH_LEGACY_SERVER_H
#define AUTH_LEGACY_SERVER_H #define AUTH_LEGACY_SERVER_H
#include "../jrd/ibase.h" #include "ibase.h"
#include "../common/utils_proto.h" #include "../common/utils_proto.h"
#include "../common/sha.h" #include "../common/sha.h"
#include "gen/iberror.h" #include "gen/iberror.h"

2
src/auth/trusted/AuthSspi.h
View File

@ -39,7 +39,7 @@
#include <../common/classes/fb_string.h> #include <../common/classes/fb_string.h>
#include <../common/classes/array.h> #include <../common/classes/array.h>
#include "../common/classes/ImplementHelper.h" #include "../common/classes/ImplementHelper.h"
#include <../jrd/ibase.h> #include <ibase.h>
#include "firebird/Interface.h" #include "firebird/Interface.h"
#include "../common/classes/objects_array.h" #include "../common/classes/objects_array.h"

2
src/burp/burp.cpp
View File

@ -36,7 +36,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <signal.h> #include <signal.h>
#include "../jrd/ibase.h" #include "ibase.h"
#include <stdarg.h> #include <stdarg.h>
#include "../jrd/ibsetjmp.h" #include "../jrd/ibsetjmp.h"
#include "../common/msg_encode.h" #include "../common/msg_encode.h"

2
src/burp/burp.h
View File

@ -30,7 +30,7 @@
#define BURP_BURP_H #define BURP_BURP_H
#include <stdio.h> #include <stdio.h>
#include "../jrd/ibase.h" #include "ibase.h"
#include "firebird/Interface.h" #include "firebird/Interface.h"
#include "firebird/Message.h" #include "firebird/Message.h"
#include "../common/dsc.h" #include "../common/dsc.h"

2
src/burp/burpswi.h
View File

@ -28,7 +28,7 @@
#define BURP_BURPSWI_H #define BURP_BURPSWI_H
#include "../jrd/constants.h" #include "../jrd/constants.h"
#include "../jrd/ibase.h" #include "ibase.h"
/* Local copies of global variables. They will be copied into /* Local copies of global variables. They will be copied into
a data structure. */ a data structure. */

2
src/common/Auth.cpp
View File

@ -27,7 +27,7 @@
#include "firebird.h" #include "firebird.h"
#include "../common/Auth.h" #include "../common/Auth.h"
#include "../jrd/ibase.h" #include "ibase.h"
#include "../common/classes/ImplementHelper.h" #include "../common/classes/ImplementHelper.h"
#include "../common/utils_proto.h" #include "../common/utils_proto.h"
#include "../common/db_alias.h" #include "../common/db_alias.h"

2
src/common/IntlParametersBlock.cpp
View File

@ -29,7 +29,7 @@
#include "firebird.h" #include "firebird.h"
#include "../common/IntlParametersBlock.h" #include "../common/IntlParametersBlock.h"
#include "consts_pub.h" #include "firebird/impl/consts_pub.h"
#include "../common/isc_f_proto.h" #include "../common/isc_f_proto.h"
#include "../common/classes/ClumpletWriter.h" #include "../common/classes/ClumpletWriter.h"
#include "../common/UtilSvc.h" #include "../common/UtilSvc.h"

4
src/common/StatementMetadata.cpp
View File

@ -26,10 +26,10 @@
#include "../common/StatementMetadata.h" #include "../common/StatementMetadata.h"
#include "memory_routines.h" #include "memory_routines.h"
#include "../common/StatusHolder.h" #include "../common/StatusHolder.h"
#include "../jrd/inf_pub.h" #include "firebird/impl/inf_pub.h"
#include "../yvalve/gds_proto.h" #include "../yvalve/gds_proto.h"
#include "../common/utils_proto.h" #include "../common/utils_proto.h"
#include "../dsql/sqlda_pub.h" #include "firebird/impl/sqlda_pub.h"
namespace Firebird { namespace Firebird {

2
src/common/call_service.h
View File

@ -24,7 +24,7 @@
#ifndef UTILITIES_GSEC_CALL_SERVICE_H #ifndef UTILITIES_GSEC_CALL_SERVICE_H
#define UTILITIES_GSEC_CALL_SERVICE_H #define UTILITIES_GSEC_CALL_SERVICE_H
#include "../jrd/ibase.h" #include "ibase.h"
#include "../utilities/gsec/gsec.h" #include "../utilities/gsec/gsec.h"
#include "../common/security.h" #include "../common/security.h"

2
src/common/classes/BlobWrapper.cpp
View File

@ -24,7 +24,7 @@
#include "firebird.h" #include "firebird.h"
#include "BlobWrapper.h" #include "BlobWrapper.h"
#include "../jrd/ibase.h" #include "ibase.h"
#include "firebird/Interface.h" #include "firebird/Interface.h"
static const USHORT SEGMENT_LIMIT = 65535; static const USHORT SEGMENT_LIMIT = 65535;

4
src/common/classes/BlrWriter.cpp
View File

@ -19,11 +19,11 @@
*/ */
#include "firebird.h" #include "firebird.h"
#include "consts_pub.h" #include "firebird/impl/consts_pub.h"
#include "dyn_consts.h" #include "dyn_consts.h"
#include "gen/iberror.h" #include "gen/iberror.h"
#include "../common/classes/BlrWriter.h" #include "../common/classes/BlrWriter.h"
#include "../jrd/blr.h" #include "firebird/impl/blr.h"
namespace Firebird { namespace Firebird {

2
src/common/classes/ClumpletReader.cpp
View File

@ -32,7 +32,7 @@
#include "../common/classes/MetaName.h" #include "../common/classes/MetaName.h"
#include "fb_exception.h" #include "fb_exception.h"
#include "../jrd/ibase.h" #include "ibase.h"
#include "firebird/Interface.h" #include "firebird/Interface.h"
#ifdef DEBUG_CLUMPLETS #ifdef DEBUG_CLUMPLETS

3
src/common/classes/ClumpletWriter.cpp
View File

@ -32,8 +32,7 @@
#include "../common/classes/ClumpletWriter.h" #include "../common/classes/ClumpletWriter.h"
#include "../common/classes/MetaName.h" #include "../common/classes/MetaName.h"
#include "fb_exception.h" #include "fb_exception.h"
#include "ibase.h"
#include "../jrd/ibase.h"
namespace Firebird { namespace Firebird {

2
src/common/classes/ImplementHelper.h
View File

@ -37,7 +37,7 @@
#include "../common/classes/auto.h" #include "../common/classes/auto.h"
#include "../common/classes/RefCounted.h" #include "../common/classes/RefCounted.h"
#include "../common/StatusArg.h" #include "../common/StatusArg.h"
#include "consts_pub.h" #include "firebird/impl/consts_pub.h"
#ifdef DEV_BUILD #ifdef DEV_BUILD
#include <stdio.h> #include <stdio.h>
#endif #endif

4
src/common/classes/InternalMessageBuffer.cpp
View File

@ -32,8 +32,8 @@
#include "../common/classes/BlrReader.h" #include "../common/classes/BlrReader.h"
#include "../common/gdsassert.h" #include "../common/gdsassert.h"
#include "../common/MsgMetadata.h" #include "../common/MsgMetadata.h"
#include "../dsql/sqlda_pub.h" #include "firebird/impl/sqlda_pub.h"
#include "../jrd/blr.h" #include "firebird/impl/blr.h"
namespace Firebird namespace Firebird
{ {

2
src/common/classes/NoThrowTimeStamp.h
View File

@ -27,7 +27,7 @@
#ifndef CLASSES_NOTHROW_TIMESTAMP_H #ifndef CLASSES_NOTHROW_TIMESTAMP_H
#define CLASSES_NOTHROW_TIMESTAMP_H #define CLASSES_NOTHROW_TIMESTAMP_H
#include "../common/dsc_pub.h" #include "firebird/impl/dsc_pub.h"
// struct tm declaration // struct tm declaration
#if defined(TIME_WITH_SYS_TIME) #if defined(TIME_WITH_SYS_TIME)

2
src/common/classes/UserBlob.cpp
View File

@ -22,7 +22,7 @@
*/ */
#include "UserBlob.h" #include "UserBlob.h"
#include "../jrd/ibase.h" #include "ibase.h"
#include "../yvalve/gds_proto.h" #include "../yvalve/gds_proto.h"
static const USHORT SEGMENT_LIMIT = 65535; static const USHORT SEGMENT_LIMIT = 65535;

2
src/common/dsc.cpp
View File

@ -28,7 +28,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "../common/dsc.h" #include "../common/dsc.h"
#include "../common/TimeZoneUtil.h" #include "../common/TimeZoneUtil.h"
#include "../jrd/ibase.h" #include "ibase.h"
#include "../jrd/intl.h" #include "../jrd/intl.h"
#include "../yvalve/gds_proto.h" #include "../yvalve/gds_proto.h"
#include "../common/gdsassert.h" #include "../common/gdsassert.h"

4
src/common/dsc.h
View File

@ -27,8 +27,8 @@
#ifndef JRD_DSC_H #ifndef JRD_DSC_H
#define JRD_DSC_H #define JRD_DSC_H
#include "../common/dsc_pub.h" #include "firebird/impl/dsc_pub.h"
#include "consts_pub.h" #include "firebird/impl/consts_pub.h"
#include "../jrd/ods.h" #include "../jrd/ods.h"
#include "../intl/charsets.h" #include "../intl/charsets.h"
#include "../common/DecFloat.h" #include "../common/DecFloat.h"

2
src/common/isc.cpp
View File

@ -41,7 +41,7 @@
#include <errno.h> #include <errno.h>
#include "gen/iberror.h" #include "gen/iberror.h"
#include "../jrd/ibase.h" #include "ibase.h"
#include "../jrd/scl.h" #include "../jrd/scl.h"
#include "../yvalve/gds_proto.h" #include "../yvalve/gds_proto.h"
#include "../common/isc_proto.h" #include "../common/isc_proto.h"

2
src/common/pretty.cpp
View File

@ -31,7 +31,7 @@
#include "dyn_consts.h" #include "dyn_consts.h"
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#include "../jrd/ibase.h" #include "ibase.h"
#include "../jrd/constants.h" #include "../jrd/constants.h"
#include "../common/prett_proto.h" #include "../common/prett_proto.h"
#include "../yvalve/gds_proto.h" #include "../yvalve/gds_proto.h"

2
src/common/sdl.cpp
View File

@ -23,7 +23,7 @@
#include "firebird.h" #include "firebird.h"
#include <string.h> #include <string.h>
#include "../jrd/ibase.h" #include "ibase.h"
#include "../jrd/val.h" #include "../jrd/val.h"
#include "../common/sdl.h" #include "../common/sdl.h"
#include "../jrd/intl.h" #include "../jrd/intl.h"

4
src/common/utils.cpp
View File

@ -45,13 +45,13 @@
#include "../common/classes/locks.h" #include "../common/classes/locks.h"
#include "../common/classes/init.h" #include "../common/classes/init.h"
#include "../jrd/constants.h" #include "../jrd/constants.h"
#include "../jrd/inf_pub.h" #include "firebird/impl/inf_pub.h"
#include "../jrd/align.h" #include "../jrd/align.h"
#include "../common/os/path_utils.h" #include "../common/os/path_utils.h"
#include "../common/os/fbsyslog.h" #include "../common/os/fbsyslog.h"
#include "../common/StatusArg.h" #include "../common/StatusArg.h"
#include "../common/os/os_utils.h" #include "../common/os/os_utils.h"
#include "../dsql/sqlda_pub.h" #include "firebird/impl/sqlda_pub.h"
#include "../common/classes/ClumpletReader.h" #include "../common/classes/ClumpletReader.h"
#include "../common/StatusArg.h" #include "../common/StatusArg.h"

2
src/dsql/AggNodes.cpp
View File

@ -22,7 +22,7 @@
#include "../dsql/AggNodes.h" #include "../dsql/AggNodes.h"
#include "../dsql/ExprNodes.h" #include "../dsql/ExprNodes.h"
#include "../jrd/jrd.h" #include "../jrd/jrd.h"
#include "../jrd/blr.h" #include "firebird/impl/blr.h"
#include "../jrd/btr.h" #include "../jrd/btr.h"
#include "../jrd/exe.h" #include "../jrd/exe.h"
#include "../jrd/tra.h" #include "../jrd/tra.h"

2
src/dsql/AggNodes.h
View File

@ -23,7 +23,7 @@
#ifndef DSQL_AGG_NODES_H #ifndef DSQL_AGG_NODES_H
#define DSQL_AGG_NODES_H #define DSQL_AGG_NODES_H
#include "../jrd/blr.h" #include "firebird/impl/blr.h"
#include "../dsql/Nodes.h" #include "../dsql/Nodes.h"
#include "../dsql/NodePrinter.h" #include "../dsql/NodePrinter.h"

4
src/dsql/BlrDebugWriter.cpp
View File

@ -20,7 +20,7 @@
*/ */
#include "firebird.h" #include "firebird.h"
#include "consts_pub.h" #include "firebird/impl/consts_pub.h"
#include "dyn_consts.h" #include "dyn_consts.h"
#include "gen/iberror.h" #include "gen/iberror.h"
#include "../jrd/jrd.h" #include "../jrd/jrd.h"
@ -28,7 +28,7 @@
#include "../dsql/BlrDebugWriter.h" #include "../dsql/BlrDebugWriter.h"
#include "../dsql/StmtNodes.h" #include "../dsql/StmtNodes.h"
#include "../dsql/dsql.h" #include "../dsql/dsql.h"
#include "../jrd/blr.h" #include "firebird/impl/blr.h"
#include "../jrd/DebugInterface.h" #include "../jrd/DebugInterface.h"
#include "../dsql/errd_proto.h" #include "../dsql/errd_proto.h"

2
src/dsql/BoolNodes.cpp
View File

@ -24,7 +24,7 @@
#include "../dsql/ExprNodes.h" #include "../dsql/ExprNodes.h"
#include "../dsql/StmtNodes.h" #include "../dsql/StmtNodes.h"
#include "../jrd/align.h" #include "../jrd/align.h"
#include "../jrd/blr.h" #include "firebird/impl/blr.h"
#include "../jrd/tra.h" #include "../jrd/tra.h"
#include "../jrd/recsrc/RecordSource.h" #include "../jrd/recsrc/RecordSource.h"
#include "../jrd/recsrc/Cursor.h" #include "../jrd/recsrc/Cursor.h"

2
src/dsql/BoolNodes.h
View File

@ -23,7 +23,7 @@
#ifndef DSQL_BOOL_NODES_H #ifndef DSQL_BOOL_NODES_H
#define DSQL_BOOL_NODES_H #define DSQL_BOOL_NODES_H
#include "../jrd/blr.h" #include "firebird/impl/blr.h"
#include "../dsql/Nodes.h" #include "../dsql/Nodes.h"
namespace Jrd { namespace Jrd {

2
src/dsql/DdlNodes.epp
View File

@ -24,7 +24,7 @@
#include "../dsql/BoolNodes.h" #include "../dsql/BoolNodes.h"
#include "../dsql/ExprNodes.h" #include "../dsql/ExprNodes.h"
#include "../dsql/StmtNodes.h" #include "../dsql/StmtNodes.h"
#include "../jrd/blr.h" #include "firebird/impl/blr.h"
#include "../jrd/btr.h" #include "../jrd/btr.h"
#include "../jrd/dyn.h" #include "../jrd/dyn.h"
#include "../jrd/flags.h" #include "../jrd/flags.h"

2
src/dsql/DdlNodes.h
View File

@ -23,7 +23,7 @@
#ifndef DSQL_DDL_NODES_H #ifndef DSQL_DDL_NODES_H
#define DSQL_DDL_NODES_H #define DSQL_DDL_NODES_H
#include "../jrd/blr.h" #include "firebird/impl/blr.h"
#include "../jrd/dyn.h" #include "../jrd/dyn.h"
#include "../common/msg_encode.h" #include "../common/msg_encode.h"
#include "../dsql/make_proto.h" #include "../dsql/make_proto.h"

2
src/dsql/DsqlCompilerScratch.cpp
View File

@ -24,7 +24,7 @@
#include "../dsql/ExprNodes.h" #include "../dsql/ExprNodes.h"
#include "../dsql/StmtNodes.h" #include "../dsql/StmtNodes.h"
#include "../jrd/jrd.h" #include "../jrd/jrd.h"
#include "../jrd/blr.h" #include "firebird/impl/blr.h"
#include "../jrd/RecordSourceNodes.h" #include "../jrd/RecordSourceNodes.h"
#include "../dsql/ddl_proto.h" #include "../dsql/ddl_proto.h"
#include "../dsql/errd_proto.h" #include "../dsql/errd_proto.h"

2
src/dsql/ExprNodes.cpp
View File

@ -28,7 +28,7 @@
#include "../dsql/BoolNodes.h" #include "../dsql/BoolNodes.h"
#include "../dsql/StmtNodes.h" #include "../dsql/StmtNodes.h"
#include "../jrd/align.h" #include "../jrd/align.h"
#include "../jrd/blr.h" #include "firebird/impl/blr.h"
#include "../jrd/tra.h" #include "../jrd/tra.h"
#include "../jrd/Function.h" #include "../jrd/Function.h"
#include "../jrd/SysFunction.h" #include "../jrd/SysFunction.h"

2
src/dsql/ExprNodes.h
View File

@ -23,7 +23,7 @@
#ifndef DSQL_EXPR_NODES_H #ifndef DSQL_EXPR_NODES_H
#define DSQL_EXPR_NODES_H #define DSQL_EXPR_NODES_H
#include "../jrd/blr.h" #include "firebird/impl/blr.h"
#include "../dsql/Nodes.h" #include "../dsql/Nodes.h"
#include "../dsql/NodePrinter.h" #include "../dsql/NodePrinter.h"
#include "../dsql/pass1_proto.h" #include "../dsql/pass1_proto.h"

2
src/dsql/StmtNodes.cpp
View File

@ -27,7 +27,7 @@
#include "../dsql/ExprNodes.h" #include "../dsql/ExprNodes.h"
#include "../dsql/StmtNodes.h" #include "../dsql/StmtNodes.h"
#include "../jrd/align.h" #include "../jrd/align.h"
#include "../jrd/blr.h" #include "firebird/impl/blr.h"
#include "../jrd/tra.h" #include "../jrd/tra.h"
#include "../jrd/Function.h" #include "../jrd/Function.h"
#include "../jrd/Optimizer.h" #include "../jrd/Optimizer.h"

2
src/dsql/StmtNodes.h
View File

@ -24,7 +24,7 @@
#define DSQL_STMT_NODES_H #define DSQL_STMT_NODES_H
#include "../common/classes/MetaName.h" #include "../common/classes/MetaName.h"
#include "../jrd/blr.h" #include "firebird/impl/blr.h"
#include "../jrd/Function.h" #include "../jrd/Function.h"
#include "../jrd/extds/ExtDS.h" #include "../jrd/extds/ExtDS.h"
#include "../dsql/Nodes.h" #include "../dsql/Nodes.h"

2
src/dsql/WinNodes.h
View File

@ -23,7 +23,7 @@
#ifndef DSQL_WIN_NODES_H #ifndef DSQL_WIN_NODES_H
#define DSQL_WIN_NODES_H #define DSQL_WIN_NODES_H
#include "../jrd/blr.h" #include "firebird/impl/blr.h"
#include "../dsql/Nodes.h" #include "../dsql/Nodes.h"
#include "../dsql/NodePrinter.h" #include "../dsql/NodePrinter.h"

2
src/dsql/ddl.cpp
View File

@ -76,7 +76,7 @@
#include "../common/classes/MetaName.h" #include "../common/classes/MetaName.h"
#include "../dsql/dsql.h" #include "../dsql/dsql.h"
#include "../dsql/ExprNodes.h" #include "../dsql/ExprNodes.h"
#include "../jrd/ibase.h" #include "ibase.h"
#include "../jrd/Attachment.h" #include "../jrd/Attachment.h"
#include "../jrd/RecordSourceNodes.h" #include "../jrd/RecordSourceNodes.h"
#include "../jrd/intl.h" #include "../jrd/intl.h"

2
src/dsql/dsql.cpp
View File

@ -37,7 +37,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "../dsql/dsql.h" #include "../dsql/dsql.h"
#include "../jrd/ibase.h" #include "ibase.h"
#include "../jrd/align.h" #include "../jrd/align.h"
#include "../jrd/intl.h" #include "../jrd/intl.h"
#include "../common/intlobj_new.h" #include "../common/intlobj_new.h"

2
src/dsql/gen.cpp
View File

@ -42,7 +42,7 @@
#include "../dsql/StmtNodes.h" #include "../dsql/StmtNodes.h"
#include "../dsql/DSqlDataTypeUtil.h" #include "../dsql/DSqlDataTypeUtil.h"
#include "../jrd/RecordSourceNodes.h" #include "../jrd/RecordSourceNodes.h"
#include "../jrd/ibase.h" #include "ibase.h"
#include "../jrd/align.h" #include "../jrd/align.h"
#include "../jrd/constants.h" #include "../jrd/constants.h"
#include "../jrd/intl.h" #include "../jrd/intl.h"

2
src/dsql/make.cpp
View File

@ -39,7 +39,7 @@
#include "../dsql/dsql.h" #include "../dsql/dsql.h"
#include "../dsql/Nodes.h" #include "../dsql/Nodes.h"
#include "../dsql/ExprNodes.h" #include "../dsql/ExprNodes.h"
#include "../jrd/ibase.h" #include "ibase.h"
#include "../jrd/intl.h" #include "../jrd/intl.h"
#include "../jrd/constants.h" #include "../jrd/constants.h"
#include "../jrd/align.h" #include "../jrd/align.h"

2
src/dsql/metd.epp
View File

@ -35,7 +35,7 @@
#include "firebird.h" #include "firebird.h"
#include <string.h> #include <string.h>
#include "../dsql/dsql.h" #include "../dsql/dsql.h"
#include "../jrd/ibase.h" #include "ibase.h"
#include "../jrd/align.h" #include "../jrd/align.h"
#include "../jrd/intl.h" #include "../jrd/intl.h"
#include "../jrd/irq.h" #include "../jrd/irq.h"

2
src/dsql/parse.y
View File

@ -83,7 +83,7 @@
#include "gen/iberror.h" #include "gen/iberror.h"
#include "../dsql/dsql.h" #include "../dsql/dsql.h"
#include "../jrd/ibase.h" #include "ibase.h"
#include "../jrd/flags.h" #include "../jrd/flags.h"
#include "../jrd/jrd.h" #include "../jrd/jrd.h"
#include "../jrd/DataTypeUtil.h" #include "../jrd/DataTypeUtil.h"

4
src/dsql/pass1.cpp
View File

@ -141,13 +141,13 @@
#include "firebird.h" #include "firebird.h"
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include "../jrd/ibase.h" #include "ibase.h"
#include "../dsql/dsql.h" #include "../dsql/dsql.h"
#include "../dsql/Nodes.h" #include "../dsql/Nodes.h"
#include "../dsql/BoolNodes.h" #include "../dsql/BoolNodes.h"
#include "../dsql/ExprNodes.h" #include "../dsql/ExprNodes.h"
#include "../jrd/intl.h" #include "../jrd/intl.h"
#include "../jrd/blr.h" #include "firebird/impl/blr.h"
#include "../jrd/jrd.h" #include "../jrd/jrd.h"
#include "../jrd/constants.h" #include "../jrd/constants.h"
#include "../jrd/intl_classes.h" #include "../jrd/intl_classes.h"

2
src/dsql/sqlda.h
View File

@ -52,6 +52,6 @@ struct SQLDA
#define SQLDA_LENGTH(n) (sizeof (SQLDA) + (n - 1) * sizeof (SQLVAR)) #define SQLDA_LENGTH(n) (sizeof (SQLDA) + (n - 1) * sizeof (SQLVAR))
#include "../dsql/sqlda_pub.h" #include "firebird/impl/sqlda_pub.h"
#endif // DSQL_SQLDA_H #endif // DSQL_SQLDA_H

2
src/dsql/utld.cpp
View File

@ -35,7 +35,7 @@
#include <string.h> #include <string.h>
#include "../dsql/dsql.h" #include "../dsql/dsql.h"
#include "../dsql/sqlda.h" #include "../dsql/sqlda.h"
#include "../jrd/ibase.h" #include "ibase.h"
#include "../jrd/align.h" #include "../jrd/align.h"
#include "../jrd/constants.h" #include "../jrd/constants.h"
#include "../dsql/utld_proto.h" #include "../dsql/utld_proto.h"

2
src/gpre/boot/gpre_meta_boot.cpp
View File

@ -30,7 +30,7 @@
#include "firebird.h" #include "firebird.h"
#include <string.h> #include <string.h>
#include "../jrd/ibase.h" #include "ibase.h"
#include "../gpre/gpre.h" #include "../gpre/gpre.h"
#include "../jrd/intl.h" #include "../jrd/intl.h"
#include "../gpre/gpre_proto.h" #include "../gpre/gpre_proto.h"

2
src/gpre/c_cxx.cpp
View File

@ -33,7 +33,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdarg.h> #include <stdarg.h>
#include "../jrd/ibase.h" #include "ibase.h"
#include "../gpre/gpre.h" #include "../gpre/gpre.h"
#include "../gpre/pat.h" #include "../gpre/pat.h"
#include "../gpre/msc_proto.h" #include "../gpre/msc_proto.h"

2
src/gpre/cmd.cpp
View File

@ -30,7 +30,7 @@
#include "firebird.h" #include "firebird.h"
#include <string.h> #include <string.h>
#include "../gpre/gpre.h" #include "../gpre/gpre.h"
#include "../jrd/ibase.h" #include "ibase.h"
#include "../jrd/flags.h" #include "../jrd/flags.h"
#include "../gpre/cmd_proto.h" #include "../gpre/cmd_proto.h"
#include "../gpre/cme_proto.h" #include "../gpre/cme_proto.h"

2
src/gpre/cme.cpp
View File

@ -29,7 +29,7 @@
#include "firebird.h" #include "firebird.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "../jrd/ibase.h" #include "ibase.h"
#include "../gpre/gpre.h" #include "../gpre/gpre.h"
#include "../jrd/intl.h" #include "../jrd/intl.h"
#include "../intl/charsets.h" #include "../intl/charsets.h"

2
src/gpre/cmp.cpp
View File

@ -30,7 +30,7 @@
#include "firebird.h" #include "firebird.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "../jrd/ibase.h" #include "ibase.h"
#include "../gpre/gpre.h" #include "../gpre/gpre.h"
#include "../jrd/align.h" #include "../jrd/align.h"
#include "../gpre/cmd_proto.h" #include "../gpre/cmd_proto.h"

2
src/gpre/exp.cpp
View File

@ -30,7 +30,7 @@
#include "firebird.h" #include "firebird.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "../jrd/ibase.h" #include "ibase.h"
#include "../gpre/gpre.h" #include "../gpre/gpre.h"
#include "../jrd/intl.h" #include "../jrd/intl.h"
#include "../gpre/cmp_proto.h" #include "../gpre/cmp_proto.h"

4
src/gpre/gpre.h
View File

@ -64,7 +64,7 @@
#include <stdio.h> #include <stdio.h>
#include "dyn_consts.h" #include "dyn_consts.h"
#include "../jrd/ibase.h" #include "ibase.h"
#include "../jrd/constants.h" #include "../jrd/constants.h"
#include "../common/utils_proto.h" #include "../common/utils_proto.h"
@ -87,7 +87,7 @@ const int MAX_DATABASES = 32;
const int MAX_EVENT_SIZE = 16; // event names use 15 chars from old docs. const int MAX_EVENT_SIZE = 16; // event names use 15 chars from old docs.
// Values for SQL dialects. // Values for SQL dialects.
#include "../dsql/sqlda_pub.h" #include "firebird/impl/sqlda_pub.h"
// Language options // Language options

2
src/gpre/int_cxx.cpp
View File

@ -30,7 +30,7 @@
#include "firebird.h" #include "firebird.h"
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#include "../jrd/ibase.h" #include "ibase.h"
#include "../gpre/gpre.h" #include "../gpre/gpre.h"
#include "../gpre/gpre_proto.h" #include "../gpre/gpre_proto.h"
#include "../gpre/lang_proto.h" #include "../gpre/lang_proto.h"

2
src/gpre/jrdmet.cpp
View File

@ -27,7 +27,7 @@
// //
#include "firebird.h" #include "firebird.h"
#include "../jrd/ibase.h" #include "ibase.h"
#include "../jrd/constants.h" #include "../jrd/constants.h"
#include "../jrd/ods.h" #include "../jrd/ods.h"

2
src/gpre/languages/ada.cpp
View File

@ -30,7 +30,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#include "../jrd/ibase.h" #include "ibase.h"
#include "../gpre/gpre.h" #include "../gpre/gpre.h"
#include "../gpre/pat.h" #include "../gpre/pat.h"
#include "../gpre/cmp_proto.h" #include "../gpre/cmp_proto.h"

2
src/gpre/languages/cob.cpp
View File

@ -42,7 +42,7 @@
#include "firebird.h" #include "firebird.h"
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#include "../jrd/ibase.h" #include "ibase.h"
#include "../yvalve/gds_proto.h" #include "../yvalve/gds_proto.h"
#include "../gpre/gpre.h" #include "../gpre/gpre.h"
#include "../gpre/pat.h" #include "../gpre/pat.h"

10
src/gpre/languages/fbrmclib.cpp
View File

@ -46,7 +46,7 @@
#include "autoconfig.h" #include "autoconfig.h"
#endif #endif
#include "fb_types.h" #include "fb_types.h"
#include "../jrd/ibase.h" #include "ibase.h"
// Firebird transaction existence block (as defined in why.cpp) // Firebird transaction existence block (as defined in why.cpp)
@ -939,12 +939,12 @@ EXPORT RM_ENTRY(rmc_get_slice)
(isc_db_handle *)arg_vector[1].a_address, (isc_db_handle *)arg_vector[1].a_address,
(isc_tr_handle *)arg_vector[2].a_address, (isc_tr_handle *)arg_vector[2].a_address,
(ISC_QUAD *)arg_vector[3].a_address, (ISC_QUAD *)arg_vector[3].a_address,
(short)*CobolToShort(&arg_vector[4]), *CobolToShort(&arg_vector[4]),
(char *)CobolToString(&arg_vector[5]), (ISC_UCHAR *)CobolToString(&arg_vector[5]),
(short)*CobolToShort(&arg_vector[6]), *CobolToShort(&arg_vector[6]),
(ISC_LONG *)CobolToInt(&arg_vector[7]), (ISC_LONG *)CobolToInt(&arg_vector[7]),
*CobolToInt(&arg_vector[8]), *CobolToInt(&arg_vector[8]),
(void *)arg_vector[9].a_address, (ISC_LONG *)arg_vector[9].a_address,
p1); p1);
IntToCobol(&arg_vector[11], (ISC_UINT64)p1); IntToCobol(&arg_vector[11], (ISC_UINT64)p1);
StatusToCobol(&arg_vector[0], stat); StatusToCobol(&arg_vector[0], stat);

2
src/gpre/languages/ftn.cpp
View File

@ -33,7 +33,7 @@
#include "firebird.h" #include "firebird.h"
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#include "../jrd/ibase.h" #include "ibase.h"
#include "../yvalve/gds_proto.h" #include "../yvalve/gds_proto.h"
#include "../gpre/gpre.h" #include "../gpre/gpre.h"
#include "../gpre/pat.h" #include "../gpre/pat.h"

2
src/gpre/languages/pas.cpp
View File

@ -30,7 +30,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#include <string.h> #include <string.h>
#include "../jrd/ibase.h" #include "ibase.h"
#include "../gpre/gpre.h" #include "../gpre/gpre.h"
#include "../gpre/pat.h" #include "../gpre/pat.h"
#include "../gpre/cmp_proto.h" #include "../gpre/cmp_proto.h"

2
src/gpre/languages/rmc.cpp
View File

@ -28,7 +28,7 @@
#include "firebird.h" #include "firebird.h"
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#include "../jrd/ibase.h" #include "ibase.h"
#include "../yvalve/gds_proto.h" #include "../yvalve/gds_proto.h"
#include "../gpre/gpre.h" #include "../gpre/gpre.h"
#include "../gpre/pat.h" #include "../gpre/pat.h"

2
src/gpre/obj_cxx.cpp
View File

@ -33,7 +33,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdarg.h> #include <stdarg.h>
#include "../jrd/ibase.h" #include "ibase.h"
#include "../gpre/gpre.h" #include "../gpre/gpre.h"
#include "../gpre/pat.h" #include "../gpre/pat.h"
#include "../gpre/msc_proto.h" #include "../gpre/msc_proto.h"

2
src/gpre/par.cpp
View File

@ -45,7 +45,7 @@
#include <setjmp.h> #include <setjmp.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "../jrd/ibase.h" #include "ibase.h"
#include "../gpre/gpre.h" #include "../gpre/gpre.h"
#include "../gpre/cmp_proto.h" #include "../gpre/cmp_proto.h"
#include "../gpre/exp_proto.h" #include "../gpre/exp_proto.h"

2
src/gpre/sql.cpp
View File

@ -31,7 +31,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "../gpre/gpre.h" #include "../gpre/gpre.h"
#include "../jrd/ibase.h" #include "ibase.h"
#include "../jrd/intl.h" #include "../jrd/intl.h"
#include "../jrd/constants.h" #include "../jrd/constants.h"
#include "../gpre/cme_proto.h" #include "../gpre/cme_proto.h"

2
src/gpre/std/gpre_meta.epp
View File

@ -30,7 +30,7 @@
#include "firebird.h" #include "firebird.h"
#include <string.h> #include <string.h>
#include "../jrd/ibase.h" #include "ibase.h"
#include "../gpre/gpre.h" #include "../gpre/gpre.h"
#include "../jrd/intl.h" #include "../jrd/intl.h"
#include "../gpre/gpre_proto.h" #include "../gpre/gpre_proto.h"

2
src/include/fb_types.h
View File

@ -76,7 +76,7 @@ typedef ULONG ISC_ULONG;
typedef SINT64 ISC_INT64; typedef SINT64 ISC_INT64;
typedef FB_UINT64 ISC_UINT64; typedef FB_UINT64 ISC_UINT64;
#include "types_pub.h" #include "firebird/impl/types_pub.h"
typedef ISC_QUAD SQUAD; typedef ISC_QUAD SQUAD;

6
src/jrd/blr.h → src/include/firebird/impl/blr.h
View File

@ -30,8 +30,8 @@
* Adriano dos Santos Fernandes * Adriano dos Santos Fernandes
*/ */
#ifndef JRD_BLR_H #ifndef FIREBIRD_IMPL_BLR_H
#define JRD_BLR_H #define FIREBIRD_IMPL_BLR_H
#define BLR_WORD(x) UCHAR(x), UCHAR((x) >> 8) #define BLR_WORD(x) UCHAR(x), UCHAR((x) >> 8)
@ -441,4 +441,4 @@
#define blr_at_local (unsigned char) 0 #define blr_at_local (unsigned char) 0
#define blr_at_zone (unsigned char) 1 #define blr_at_zone (unsigned char) 1
#endif // JRD_BLR_H #endif // FIREBIRD_IMPL_BLR_H

6
src/include/consts_pub.h → src/include/firebird/impl/consts_pub.h
View File

@ -23,8 +23,8 @@
* *
*/ */
#ifndef INCLUDE_CONSTS_PUB_H #ifndef FIREBIRD_IMPL_CONSTS_PUB_H
#define INCLUDE_CONSTS_PUB_H #define FIREBIRD_IMPL_CONSTS_PUB_H
/**********************************/ /**********************************/
/* Database parameter block stuff */ /* Database parameter block stuff */
@ -737,4 +737,4 @@
#define fb_dbg_arg_input 0 #define fb_dbg_arg_input 0
#define fb_dbg_arg_output 1 #define fb_dbg_arg_output 1
#endif // ifndef INCLUDE_CONSTS_PUB_H #endif // ifndef FIREBIRD_IMPL_CONSTS_PUB_H

6
src/common/dsc_pub.h → src/include/firebird/impl/dsc_pub.h
View File

@ -23,8 +23,8 @@
* compatible with the HP Compiler * compatible with the HP Compiler
*/ */
#ifndef JRD_DSC_PUB_H #ifndef FIREBIRD_IMPL_DSC_PUB_H
#define JRD_DSC_PUB_H #define FIREBIRD_IMPL_DSC_PUB_H
/* /*
@ -71,4 +71,4 @@
#define ISC_TIME_SECONDS_PRECISION 10000 #define ISC_TIME_SECONDS_PRECISION 10000
#define ISC_TIME_SECONDS_PRECISION_SCALE (-4) #define ISC_TIME_SECONDS_PRECISION_SCALE (-4)
#endif /* JRD_DSC_PUB_H */ #endif /* FIREBIRD_IMPL_DSC_PUB_H */

7
src/jrd/inf_pub.h → src/include/firebird/impl/inf_pub.h
View File

@ -23,8 +23,8 @@
* 2001.07.28: John Bellardo: Added isc_info_rsb_skip to support LIMIT. * 2001.07.28: John Bellardo: Added isc_info_rsb_skip to support LIMIT.
*/ */
#ifndef JRD_INF_PUB_H #ifndef FIREBIRD_IMPL_INF_PUB_H
#define JRD_INF_PUB_H #define FIREBIRD_IMPL_INF_PUB_H
/* Common, structural codes */ /* Common, structural codes */
/****************************/ /****************************/
@ -462,5 +462,4 @@ enum info_db_provider
#define isc_info_sql_stmt_set_generator 13 #define isc_info_sql_stmt_set_generator 13
#define isc_info_sql_stmt_savepoint 14 #define isc_info_sql_stmt_savepoint 14
#endif /* JRD_INF_PUB_H */ #endif /* FIREBIRD_IMPL_INF_PUB_H */

7
src/dsql/sqlda_pub.h → src/include/firebird/impl/sqlda_pub.h
View File

@ -21,8 +21,8 @@
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
*/ */
#ifndef DSQL_SQLDA_PUB_H #ifndef FIREBIRD_IMPL_SQLDA_PUB_H
#define DSQL_SQLDA_PUB_H #define FIREBIRD_IMPL_SQLDA_PUB_H
/* Definitions for DSQL free_statement routine */ /* Definitions for DSQL free_statement routine */
@ -104,5 +104,4 @@ typedef struct
numeric type */ numeric type */
#define SQL_DIALECT_CURRENT SQL_DIALECT_V6 /* latest IB DIALECT */ #define SQL_DIALECT_CURRENT SQL_DIALECT_V6 /* latest IB DIALECT */
#endif /* DSQL_SQLDA_PUB_H */ #endif /* FIREBIRD_IMPL_SQLDA_PUB_H */

6
src/include/types_pub.h → src/include/firebird/impl/types_pub.h
View File

@ -24,8 +24,8 @@
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
*/ */
#ifndef INCLUDE_TYPES_PUB_H #ifndef FIREBIRD_IMPL_TYPES_PUB_H
#define INCLUDE_TYPES_PUB_H #define FIREBIRD_IMPL_TYPES_PUB_H
#include <stddef.h> #include <stddef.h>
@ -200,4 +200,4 @@ struct FB_DEC34_t {
typedef struct FB_DEC16_t FB_DEC16; typedef struct FB_DEC16_t FB_DEC16;
typedef struct FB_DEC34_t FB_DEC34; typedef struct FB_DEC34_t FB_DEC34;
#endif /* INCLUDE_TYPES_PUB_H */ #endif /* FIREBIRD_IMPL_TYPES_PUB_H */

1193
src/include/ibase.h
View File

File diff suppressed because it is too large Load Diff

2
src/isql/extract.epp
View File

@ -46,7 +46,7 @@
#include <math.h> #include <math.h>
#include <ctype.h> // isdigit #include <ctype.h> // isdigit
#include "../jrd/constants.h" #include "../jrd/constants.h"
#include "../jrd/ibase.h" #include "ibase.h"
#include "../yvalve/gds_proto.h" #include "../yvalve/gds_proto.h"
#include "../common/intlobj_new.h" #include "../common/intlobj_new.h"
#include "../isql/isql.h" #include "../isql/isql.h"

2
src/isql/isql.epp
View File

@ -100,7 +100,7 @@ enum literal_string_type
#if defined(WIN_NT) #if defined(WIN_NT)
#include <windows.h> #include <windows.h>
#endif #endif
#include "../jrd/ibase.h" #include "ibase.h"
#include "../isql/isql.h" #include "../isql/isql.h"
#include "../yvalve/perf.h" #include "../yvalve/perf.h"
#include "../jrd/license.h" #include "../jrd/license.h"

2
src/isql/isqlswi.h
View File

@ -25,7 +25,7 @@
#ifndef ISQL_ISQLSWI_H #ifndef ISQL_ISQLSWI_H
#define ISQL_ISQLSWI_H #define ISQL_ISQLSWI_H
#include "../jrd/ibase.h" #include "ibase.h"
#include "../jrd/constants.h" #include "../jrd/constants.h"
enum isql_switches enum isql_switches

2
src/isql/iutils.cpp
View File

@ -31,7 +31,7 @@
//#include <windows.h> //#include <windows.h>
//#endif //#endif
#include <ctype.h> #include <ctype.h>
#include "../jrd/ibase.h" #include "ibase.h"
#include "isql.h" #include "isql.h"
#include "../common/classes/MsgPrint.h" #include "../common/classes/MsgPrint.h"
#include <stdarg.h> #include <stdarg.h>

2
src/isql/show.epp
View File

@ -41,7 +41,7 @@
#include <string.h> #include <string.h>
#include "../yvalve/gds_proto.h" #include "../yvalve/gds_proto.h"
#include "../jrd/ibase.h" #include "ibase.h"
#include "../isql/isql.h" #include "../isql/isql.h"
#include "../jrd/intl.h" #include "../jrd/intl.h"
#include "../common/intlobj_new.h" #include "../common/intlobj_new.h"

2
src/jrd/CryptoManager.cpp
View File

@ -43,7 +43,7 @@
#include "../jrd/cch_proto.h" #include "../jrd/cch_proto.h"
#include "../jrd/lck_proto.h" #include "../jrd/lck_proto.h"
#include "../jrd/pag_proto.h" #include "../jrd/pag_proto.h"
#include "../jrd/inf_pub.h" #include "firebird/impl/inf_pub.h"
#include "../jrd/Monitoring.h" #include "../jrd/Monitoring.h"
#include "../jrd/os/pio_proto.h" #include "../jrd/os/pio_proto.h"
#include "../common/isc_proto.h" #include "../common/isc_proto.h"

6
src/jrd/ExtEngineManager.cpp
View File

@ -21,11 +21,11 @@
*/ */
#include "firebird.h" #include "firebird.h"
#include "consts_pub.h" #include "firebird/impl/consts_pub.h"
#include "iberror.h" #include "iberror.h"
#include "inf_pub.h" #include "firebird/impl/inf_pub.h"
#include "../jrd/ExtEngineManager.h" #include "../jrd/ExtEngineManager.h"
#include "../dsql/sqlda_pub.h" #include "firebird/impl/sqlda_pub.h"
#include "../common/dsc.h" #include "../common/dsc.h"
#include "../jrd/align.h" #include "../jrd/align.h"
#include "../jrd/jrd.h" #include "../jrd/jrd.h"

2
src/jrd/PreparedStatement.cpp
View File

@ -27,7 +27,7 @@
#include "../jrd/req.h" #include "../jrd/req.h"
#include "../dsql/dsql.h" #include "../dsql/dsql.h"
#include "../common/classes/auto.h" #include "../common/classes/auto.h"
#include "../dsql/sqlda_pub.h" #include "firebird/impl/sqlda_pub.h"
#include "../dsql/dsql_proto.h" #include "../dsql/dsql_proto.h"
#include "../jrd/mov_proto.h" #include "../jrd/mov_proto.h"
#include "../jrd/Attachment.h" #include "../jrd/Attachment.h"

2
src/jrd/ResultSet.cpp
View File

@ -26,7 +26,7 @@
#include "../jrd/jrd.h" #include "../jrd/jrd.h"
#include "../jrd/req.h" #include "../jrd/req.h"
#include "../dsql/dsql.h" #include "../dsql/dsql.h"
#include "../dsql/sqlda_pub.h" #include "firebird/impl/sqlda_pub.h"
#include "../dsql/dsql_proto.h" #include "../dsql/dsql_proto.h"
#include "../jrd/mov_proto.h" #include "../jrd/mov_proto.h"

2
src/jrd/align.h
View File

@ -33,7 +33,7 @@ Maximum alignments for corresponding data types are defined in dsc.h
*/ */
#include "../common/DecFloat.h" #include "../common/DecFloat.h"
#include "../jrd/blr.h" #include "firebird/impl/blr.h"
/* The following macro must be defined as the highest-numericly-valued /* The following macro must be defined as the highest-numericly-valued
* blr which describes a datatype: arrays are sized based on this value. * blr which describes a datatype: arrays are sized based on this value.

2
src/jrd/evl.cpp
View File

@ -80,7 +80,7 @@
#include "../jrd/intl_classes.h" #include "../jrd/intl_classes.h"
#include "../jrd/rse.h" #include "../jrd/rse.h"
#include "../jrd/sort.h" #include "../jrd/sort.h"
#include "../jrd/blr.h" #include "firebird/impl/blr.h"
#include "../jrd/tra.h" #include "../jrd/tra.h"
#include "../common/gdsassert.h" #include "../common/gdsassert.h"
#include "../common/classes/auto.h" #include "../common/classes/auto.h"

2
src/jrd/exe.cpp
View File

@ -72,7 +72,7 @@
#include "../jrd/intl.h" #include "../jrd/intl.h"
#include "../jrd/sbm.h" #include "../jrd/sbm.h"
#include "../jrd/blb.h" #include "../jrd/blb.h"
#include "../jrd/blr.h" #include "firebird/impl/blr.h"
#include "../dsql/ExprNodes.h" #include "../dsql/ExprNodes.h"
#include "../dsql/StmtNodes.h" #include "../dsql/StmtNodes.h"
#include "../jrd/blb_proto.h" #include "../jrd/blb_proto.h"

Some files were not shown because too many files have changed in this diff Show More