firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 21:23:04 +01:00
Code Issues

small fixes for ftn.cpp, include fbudf for the linux build

Browse Source 
FSG
This commit is contained in:
fsg 2003-09-30 09:41:42 +00:00
parent c7ecf79ace
commit 002b4738fa
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.in
View File

@ -1,4 +1,4 @@
dnl $Id: configure.in,v 1.156 2003-09-23 22:38:42 skidder Exp $ dnl $Id: configure.in,v 1.157 2003-09-30 09:41:40 fsg Exp $
dnl ############################# INITIALISATION ############################### dnl ############################# INITIALISATION ###############################
@ -746,6 +746,8 @@ gen/Makefile.client.gdef:${MAKE_SRC_DIR}/Makefile.in.client.gdef
gen/Makefile.client.isql:${MAKE_SRC_DIR}/Makefile.in.client.isql gen/Makefile.client.isql:${MAKE_SRC_DIR}/Makefile.in.client.isql
gen/Makefile.client.gpre:${MAKE_SRC_DIR}/Makefile.in.client.gpre gen/Makefile.client.gpre:${MAKE_SRC_DIR}/Makefile.in.client.gpre
gen/Makefile.client.util:${MAKE_SRC_DIR}/Makefile.in.client.util gen/Makefile.client.util:${MAKE_SRC_DIR}/Makefile.in.client.util
gen/Makefile.client.fbudf:${MAKE_SRC_DIR}/Makefile.in.client.fbudf
gen/Makefile.intl:${MAKE_SRC_DIR}/Makefile.in.intl gen/Makefile.intl:${MAKE_SRC_DIR}/Makefile.in.intl
gen/Makefile.msgs:${MAKE_SRC_DIR}/Makefile.in.msgs gen/Makefile.msgs:${MAKE_SRC_DIR}/Makefile.in.msgs
gen/Makefile.extlib:${MAKE_SRC_DIR}/Makefile.in.extlib gen/Makefile.extlib:${MAKE_SRC_DIR}/Makefile.in.extlib
@ -760,6 +762,8 @@ gen/Makefile.embed.isql:${MAKE_SRC_DIR}/Makefile.in.embed.isql
gen/Makefile.embed.gdef:${MAKE_SRC_DIR}/Makefile.in.embed.gdef gen/Makefile.embed.gdef:${MAKE_SRC_DIR}/Makefile.in.embed.gdef
gen/Makefile.embed.qli:${MAKE_SRC_DIR}/Makefile.in.embed.qli gen/Makefile.embed.qli:${MAKE_SRC_DIR}/Makefile.in.embed.qli
gen/Makefile.embed.gpre:${MAKE_SRC_DIR}/Makefile.in.embed.gpre gen/Makefile.embed.gpre:${MAKE_SRC_DIR}/Makefile.in.embed.gpre
gen/Makefile.embed.fbudf:${MAKE_SRC_DIR}/Makefile.in.embed.fbudf
gen/Makefile.install:builds/install/arch-specific/${MAKEFILE_PREFIX}/Makefile.in gen/Makefile.install:builds/install/arch-specific/${MAKEFILE_PREFIX}/Makefile.in
Makefile:Makefile.in Makefile:Makefile.in
gen/Makefile.extern.editline:${MAKE_SRC_DIR}/Makefile.in.extern.editline gen/Makefile.extern.editline:${MAKE_SRC_DIR}/Makefile.in.extern.editline

16
src/gpre/ftn.cpp
View File

@ -24,7 +24,7 @@
// //
//____________________________________________________________ //____________________________________________________________
// //
// $Id: ftn.cpp,v 1.29 2003-09-29 12:43:03 robocop Exp $ // $Id: ftn.cpp,v 1.30 2003-09-30 09:41:42 fsg Exp $
// //
// 2002.10.28 Sean Leyne - Completed removal of obsolete "DGUX" port // 2002.10.28 Sean Leyne - Completed removal of obsolete "DGUX" port
// 2002.10.28 Sean Leyne - Completed removal of obsolete "SGI" port // 2002.10.28 Sean Leyne - Completed removal of obsolete "SGI" port
@ -152,7 +152,7 @@ static void make_ok_test (ACT, GPRE_REQ);
static void make_port (POR); static void make_port (POR);
static void make_ready (DBB, TEXT *, TEXT *, GPRE_REQ); static void make_ready (DBB, TEXT *, TEXT *, GPRE_REQ);
static USHORT next_label (void); static USHORT next_label (void);
static void printa (SCHAR *, SCHAR *, ...); static void printa (TEXT *, TEXT *, ...);
#ifdef NOT_USED_OR_REPLACED #ifdef NOT_USED_OR_REPLACED
static void printb (SCHAR *, ...); static void printb (SCHAR *, ...);
#endif #endif
@ -1823,8 +1823,8 @@ static void gen_dyn_execute( ACT action)
printa(COLUMN, printa(COLUMN,
(sqlda2) ? (sqlda2) ?
"CALL %s (isc_status, %s, %s, %s%d%s, %s, %s)" : (TEXT*) "CALL %s (isc_status, %s, %s, %s%d%s, %s, %s)" :
"CALL %s (isc_status, %s, %s, %s%d%s, %s)", (TEXT*) "CALL %s (isc_status, %s, %s, %s%d%s, %s)",
(sqlda2) ? ISC_EMBED_DSQL_EXECUTE2 : ISC_EMBED_DSQL_EXECUTE, (sqlda2) ? ISC_EMBED_DSQL_EXECUTE2 : ISC_EMBED_DSQL_EXECUTE,
transaction, transaction,
make_name(s1, statement->dyn_statement_name), make_name(s1, statement->dyn_statement_name),
@ -1922,8 +1922,8 @@ static void gen_dyn_immediate( ACT action)
printa(COLUMN, printa(COLUMN,
(sqlda2) ? (sqlda2) ?
"CALL %s (isc_status, %s, %s, %sLEN(%s)%s, %s%s%s, %s%d%s, %s, %s)" (TEXT*) "CALL %s (isc_status, %s, %s, %sLEN(%s)%s, %s%s%s, %s%d%s, %s, %s)" :
: "CALL %s (isc_status, %s, %s, %sLEN(%s)%s, %s%s%s, %s%d%s, %s)", (TEXT*) "CALL %s (isc_status, %s, %s, %sLEN(%s)%s, %s%s%s, %s%d%s, %s)",
(sqlda2) ? ISC_EMBED_DSQL_EXECUTE_IMMEDIATE2 : (sqlda2) ? ISC_EMBED_DSQL_EXECUTE_IMMEDIATE2 :
ISC_EMBED_DSQL_EXECUTE_IMMEDIATE, transaction, ISC_EMBED_DSQL_EXECUTE_IMMEDIATE, transaction,
database->dbb_name->sym_string, DSQL_I2CONST_1, database->dbb_name->sym_string, DSQL_I2CONST_1,
@ -2019,8 +2019,8 @@ static void gen_dyn_open( ACT action)
printa(COLUMN, printa(COLUMN,
(sqlda2) ? (sqlda2) ?
"CALL %s (isc_status, %s, %s, %s%d%s, %s, %s)" : (TEXT*) "CALL %s (isc_status, %s, %s, %s%d%s, %s, %s)" :
"CALL %s (isc_status, %s, %s, %s%d%s, %s)", (TEXT*) "CALL %s (isc_status, %s, %s, %s%d%s, %s)",
(sqlda2) ? ISC_EMBED_DSQL_OPEN2 : ISC_EMBED_DSQL_OPEN, (sqlda2) ? ISC_EMBED_DSQL_OPEN2 : ISC_EMBED_DSQL_OPEN,
transaction, transaction,
make_name(s1, statement->dyn_cursor_name), make_name(s1, statement->dyn_cursor_name),