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

Fix MinGW build

Browse Source
This commit is contained in:
aafemt 2008-06-09 14:37:39 +00:00
parent e720f79864
commit c6e0cd6d55
5 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builds/posix/Makefile.in.client.util
View File

@ -68,7 +68,7 @@ $(FBCOMMON_ClientObjects) $(FBCLASSES_ClientObjects)
GSTAT_Other_Sources = jrd/btn.cpp jrd/db_alias.cpp jrd/ods.cpp common/utils.cpp \ GSTAT_Other_Sources = jrd/btn.cpp jrd/db_alias.cpp jrd/ods.cpp common/utils.cpp \
$(OS_SPECIFIC_Sources) jrd/isc_file.cpp jrd/ThreadData.cpp common/UtilSvc.cpp $(OS_SPECIFIC_Sources) jrd/isc_file.cpp jrd/isc.cpp jrd/ThreadData.cpp common/UtilSvc.cpp
GSTAT_Files = dba.epp ppg.cpp gstatMain.cpp GSTAT_Files = dba.epp ppg.cpp gstatMain.cpp
GSTAT_Sources = $(addprefix utilities/gstat/, $(GSTAT_Files)) $(GSTAT_Other_Sources) GSTAT_Sources = $(addprefix utilities/gstat/, $(GSTAT_Files)) $(GSTAT_Other_Sources)

3
builds/win32/defs/fbclient.def
View File

@ -103,9 +103,6 @@ EXPORTS
gds__start_request @74 gds__start_request @74
gds__start_transaction @75 gds__start_transaction @75
gds__temp_file @231 gds__temp_file @231
gds__thread_enable @76
gds__thread_enter @77
gds__thread_exit @78
gds__thread_start @79 gds__thread_start @79
gds__to_sqlda @80 gds__to_sqlda @80
gds__transaction_cleanup @235 gds__transaction_cleanup @235

3
builds/win32/defs/fbclient_s.def
View File

@ -18,6 +18,9 @@
EXPORTS EXPORTS
fb_interpret@12 PRIVATE fb_interpret@12 PRIVATE
fb_sqlstate@8 PRIVATE
fb_cancel_operation@12 PRIVATE
fb_shutdown_callback@16 PRIVATE
isc_attach_database@24 PRIVATE isc_attach_database@24 PRIVATE
isc_blob_default_desc@12 PRIVATE isc_blob_default_desc@12 PRIVATE

26
configure.in
View File

@ -1048,8 +1048,7 @@ dnl EKU: handle platform specific installation and packaging
dnl: Common Files dnl: Common Files
case "$PLATFORM" in case "$PLATFORM" in
[LINUX|GENTOOFREEBSD|HPUX]) [LINUX|GENTOOFREEBSD|HPUX])
AC_CONFIG_FILES([ AC_CONFIG_FILES([gen/install/misc/firebird.conf:builds/install/misc/firebird.conf
gen/install/misc/firebird.conf:builds/install/misc/firebird.conf
gen/install/misc/aliases.conf:builds/install/misc/aliases.conf.in gen/install/misc/aliases.conf:builds/install/misc/aliases.conf.in
gen/install/misc/fbintl.conf:builds/install/misc/fbintl.conf gen/install/misc/fbintl.conf:builds/install/misc/fbintl.conf
gen/firebird/bin/fb_config:builds/install/misc/fb_config.in gen/firebird/bin/fb_config:builds/install/misc/fb_config.in
@ -1096,14 +1095,13 @@ case "$PLATFORM" in
gen/firebird/bin/changeMultiConnectMode.sh:builds/install/misc/changeMultiConnectMode.sh.in gen/firebird/bin/changeMultiConnectMode.sh:builds/install/misc/changeMultiConnectMode.sh.in
gen/firebird/bin/changeGdsLibraryCompatibleLink.sh:builds/install/misc/changeGdsLibraryCompatibleLink.sh.in gen/firebird/bin/changeGdsLibraryCompatibleLink.sh:builds/install/misc/changeGdsLibraryCompatibleLink.sh.in
gen/firebird/bin/createAliasDB.sh:builds/install/misc/createAliasDB.sh.in gen/firebird/bin/createAliasDB.sh:builds/install/misc/createAliasDB.sh.in
gen/firebird/bin/linuxLibrary.sh:builds/install/arch-specific/linux/misc/linuxLibrary.sh.in gen/firebird/bin/linuxLibrary.sh:builds/install/arch-specific/linux/misc/linuxLibrary.sh.in]
],[chmod a+x gen/install/scripts/*.sh gen/install/*sh 2>/dev/null]) ,[chmod a+x gen/install/scripts/*.sh gen/install/*sh 2>/dev/null])
;; ;;
HPUX) HPUX)
HP_INSTALL_SRC_DIR=builds/install/arch-specific/hpux/${FIREBIRD_ARCH_TYPE} HP_INSTALL_SRC_DIR=builds/install/arch-specific/hpux/${FIREBIRD_ARCH_TYPE}
AC_CONFIG_FILES([ AC_CONFIG_FILES([gen/install/makeinstallImage.sh:${HP_INSTALL_SRC_DIR}/makeinstallImage.sh.in
gen/install/makeinstallImage.sh:${HP_INSTALL_SRC_DIR}/makeinstallImage.sh.in
gen/firebirdCS.psf:${HP_INSTALL_SRC_DIR}/firebirdCS.psf.in gen/firebirdCS.psf:${HP_INSTALL_SRC_DIR}/firebirdCS.psf.in
gen/firebird/bin/preInstall.sh:${HP_INSTALL_SRC_DIR}/preInstall.sh.in gen/firebird/bin/preInstall.sh:${HP_INSTALL_SRC_DIR}/preInstall.sh.in
gen/firebird/bin/tarInstall.sh:${HP_INSTALL_SRC_DIR}/tarInstall.sh.in gen/firebird/bin/tarInstall.sh:${HP_INSTALL_SRC_DIR}/tarInstall.sh.in
@ -1123,14 +1121,14 @@ case "$PLATFORM" in
;; ;;
FREEBSD) FREEBSD)
AC_CONFIG_FILES([gen/install/install.sh:builds/install/arch-specific/freebsd/install.sh.in AC_CONFIG_FILES([gen/install/install.sh:builds/install/arch-specific/freebsd/install.sh.in]
],[chmod a+x gen/install/install.sh 2>/dev/null]) ,[chmod a+x gen/install/install.sh 2>/dev/null])
;; ;;
NETBSD) NETBSD)
AC_CONFIG_FILES([gen/install/install.netbsd.sh:builds/install/arch-specific/netbsd/install.sh.in AC_CONFIG_FILES([gen/install/install.netbsd.sh:builds/install/arch-specific/netbsd/install.sh.in]
],[chmod a+x gen/install/install.netbsd.sh 2>/dev/null]) ,[chmod a+x gen/install/install.netbsd.sh 2>/dev/null])
;; ;;
@ -1139,8 +1137,8 @@ case "$PLATFORM" in
gen/install/prototype:builds/install/arch-specific/sinixz/prototype.in gen/install/prototype:builds/install/arch-specific/sinixz/prototype.in
gen/install/preinstall:builds/install/arch-specific/sinixz/preinstall.in gen/install/preinstall:builds/install/arch-specific/sinixz/preinstall.in
gen/install/postinstall:builds/install/arch-specific/sinixz/postinstall.in gen/install/postinstall:builds/install/arch-specific/sinixz/postinstall.in
gen/install/postremove:builds/install/arch-specific/sinixz/postremove.in gen/install/postremove:builds/install/arch-specific/sinixz/postremove.in]
],[chmod a+x gen/install/pre* gen/install/post* 2>/dev/null]) ,[chmod a+x gen/install/pre* gen/install/post* 2>/dev/null])
;; ;;
solx86|SOLARIS) solx86|SOLARIS)
@ -1150,8 +1148,8 @@ case "$PLATFORM" in
gen/install/Postinstall:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/postinstall.in gen/install/Postinstall:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/postinstall.in
gen/install/Postremove:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/postremove.in gen/install/Postremove:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/postremove.in
gen/install/prototypelg:builds/install/arch-specific/solaris/libgcc/prototypelg.in gen/install/prototypelg:builds/install/arch-specific/solaris/libgcc/prototypelg.in
gen/install/pkginfolg:builds/install/arch-specific/solaris/libgcc/pkginfolg.in gen/install/pkginfolg:builds/install/arch-specific/solaris/libgcc/pkginfolg.in]
],[chmod a+x gen/install/Pre* gen/install/Post* 2>/dev/null]) ,[chmod a+x gen/install/Pre* gen/install/Post* 2>/dev/null])
;; ;;
DARWIN) DARWIN)

2
src/jrd/ThreadData.h
View File

@ -31,7 +31,7 @@
#define JRD_THREADDATA_H #define JRD_THREADDATA_H
#include "firebird.h" #include "firebird.h"
#include "../jrd/isc.h" //#include "../jrd/isc.h"
#include "../common/classes/locks.h" #include "../common/classes/locks.h"
#include "../common/classes/rwlock.h" #include "../common/classes/rwlock.h"
#include "../common/classes/alloc.h" #include "../common/classes/alloc.h"