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

Fix MinGW build

Browse Source
This commit is contained in:
aafemt 2007-02-06 12:18:18 +00:00
parent 1103bd0154
commit 604d85dc77
6 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builds/posix/Makefile.in.client.gpre
View File

@ -27,7 +27,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.client.gpre,v 1.21 2005-12-20 12:14:52 alexpeshkoff Exp $ # $Id: Makefile.in.client.gpre,v 1.22 2007-02-06 12:18:03 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleType=std ObjModuleType=std
@ -43,7 +43,7 @@ GPRE_Other_Sources = jrd/dsc.cpp jrd/isc.cpp
GPRE_Files = gpre_meta.epp \ GPRE_Files = gpre_meta.epp \
cmd.cpp cme.cpp cmp.cpp c_cxx.cpp exp.cpp gpre.cpp \ cmd.cpp cme.cpp cmp.cpp c_cxx.cpp exp.cpp gpre.cpp \
hsh.cpp int_cxx.cpp jrdmet.cpp movg.cpp msc.cpp par.cpp \ hsh.cpp int_cxx.cpp jrdmet.cpp movg.cpp msc.cpp par.cpp \
pat.cpp pretty.cpp sqe.cpp sql.cpp cob.cpp \ pat.cpp pretty.cpp sqe.cpp sql.cpp \
@GPRE_LANGUAGE_MODULES@ @GPRE_LANGUAGE_MODULES@
GPRE_Sources = $(addprefix gpre/, $(GPRE_Files)) $(GPRE_Other_Sources) GPRE_Sources = $(addprefix gpre/, $(GPRE_Files)) $(GPRE_Other_Sources)

5
builds/posix/Makefile.in.libfbclient
View File

@ -62,8 +62,9 @@ DSQL_ClientSources = $(addprefix dsql/, $(DSQL_ClientFiles))
DSQL_ClientObjects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(DSQL_ClientSources)))) DSQL_ClientObjects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(DSQL_ClientSources))))
REMOTE_ClientSources = $(addprefix remote/, $(REMOTE_ClientFiles)) #REMOTE_ClientSources = $(addprefix remote/, $(REMOTE_ClientFiles))
REMOTE_ClientObjects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(REMOTE_ClientSources)))) #REMOTE_ClientObjects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(REMOTE_ClientSources))))
REMOTE_ClientObjects = $(INTERFACE_Objects)
GPRELIB_ClientSources = $(addprefix gpre/, $(GPRELIB_ClientFiles)) GPRELIB_ClientSources = $(addprefix gpre/, $(GPRELIB_ClientFiles))

9
builds/posix/make.shared.variables
View File

@ -100,16 +100,17 @@ LOCK_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(LOCK_Sources)))
REMOTE_ClientFiles = allr.cpp inet.cpp interface.cpp merge.cpp \ REMOTE_ClientFiles = allr.cpp inet.cpp interface.cpp merge.cpp \
parser.cpp protocol.cpp remote.cpp xdr.cpp parser.cpp protocol.cpp remote.cpp xdr.cpp
ifeq ($(PLATFORM),win32)
REMOTE_ClientFiles += os/win32/wnet.cpp xnet.cpp
endif
INTERFACE_Files= $(REMOTE_ClientFiles) INTERFACE_Files= $(REMOTE_ClientFiles)
INTERFACE_Sources = $(addprefix remote/, $(INTERFACE_Files)) INTERFACE_Sources = $(addprefix remote/, $(INTERFACE_Files))
INTERFACE_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(INTERFACE_Sources)))) INTERFACE_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(INTERFACE_Sources))))
ifeq ($(PLATFORM),win32)
REMOTE_ClientFiles += os/win32/wnet.cpp xnet.cpp
INTERFACE_Objects += $(OBJ)/auth/trusted/AuthSspi.o
endif
#________________________________________________________________________ #________________________________________________________________________
# #
# intl # intl

6
configure.in
View File

@ -325,7 +325,7 @@ AC_ARG_WITH(gpre-ada,
AC_ARG_WITH(gpre-cobol, AC_ARG_WITH(gpre-cobol,
[ --with-gpre-cobol support COBOL in gpre (default=no)], [ --with-gpre-cobol support COBOL in gpre (default=no)],
[case "$withval" in [case "$withval" in
yes) XE_APPEND(cob.cpp,GPRE_LANGUAGE_MODULES) yes) XE_APPEND(cob.cpp rmc.cpp,GPRE_LANGUAGE_MODULES)
AC_DEFINE(GPRE_COBOL, 1, [Define this if GPRE should support COBOL]);; AC_DEFINE(GPRE_COBOL, 1, [Define this if GPRE should support COBOL]);;
no) ;; no) ;;
*) AC_MSG_ERROR(bad value '${withval}' for --with-gpre-cobol);; *) AC_MSG_ERROR(bad value '${withval}' for --with-gpre-cobol);;
@ -762,6 +762,7 @@ dnl #### TEMP ######### directories for .o and .d
dnl # by module name dnl # by module name
mkdir -p temp/boot/alice mkdir -p temp/boot/alice
mkdir -p temp/boot/auth/trusted
mkdir -p temp/boot/burp mkdir -p temp/boot/burp
mkdir -p temp/boot/common/classes mkdir -p temp/boot/common/classes
mkdir -p temp/boot/common/config mkdir -p temp/boot/common/config
@ -795,6 +796,7 @@ mkdir -p temp/boot/utilities/rebuild
mkdir -p temp/boot/vulcan mkdir -p temp/boot/vulcan
mkdir -p temp/std/alice mkdir -p temp/std/alice
mkdir -p temp/std/auth/trusted
mkdir -p temp/std/burp mkdir -p temp/std/burp
mkdir -p temp/std/common/classes mkdir -p temp/std/common/classes
mkdir -p temp/std/common/config mkdir -p temp/std/common/config
@ -829,6 +831,7 @@ mkdir -p temp/std/vulcan
mkdir -p temp/std/extern/editline mkdir -p temp/std/extern/editline
mkdir -p temp/superclient/alice mkdir -p temp/superclient/alice
mkdir -p temp/superclient/auth/trusted
mkdir -p temp/superclient/burp mkdir -p temp/superclient/burp
mkdir -p temp/superclient/common/classes mkdir -p temp/superclient/common/classes
mkdir -p temp/superclient/common/config mkdir -p temp/superclient/common/config
@ -862,6 +865,7 @@ mkdir -p temp/superclient/utilities/rebuild
mkdir -p temp/superclient/vulcan mkdir -p temp/superclient/vulcan
mkdir -p temp/superserver/alice mkdir -p temp/superserver/alice
mkdir -p temp/superserver/auth/trusted
mkdir -p temp/superserver/burp mkdir -p temp/superserver/burp
mkdir -p temp/superserver/common/classes mkdir -p temp/superserver/common/classes
mkdir -p temp/superserver/common/config mkdir -p temp/superserver/common/config

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

@ -87,7 +87,7 @@ AuthSspi::~AuthSspi()
bool AuthSspi::checkAdminPrivilege(PCtxtHandle phContext) const bool AuthSspi::checkAdminPrivilege(PCtxtHandle phContext) const
{ {
#if defined(_MSC_VER) && _MSC_VER <= 1200 #if !defined(_MSC_VER) || _MSC_VER <= 1200
// CVC: MSVC6 hack. // CVC: MSVC6 hack.
struct SecPkgContext_AccessToken struct SecPkgContext_AccessToken
{ {

4
src/jrd/RecordNumber.h
View File

@ -158,9 +158,9 @@ public:
(((UINT64) bid_number[0]) << 32); (((UINT64) bid_number[0]) << 32);
} }
inline void setValid(bool value) inline void setValid(bool to_value)
{ {
valid = value; valid = to_value;
} }
private: private: