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

Apply MacOS changes to HEAD

Browse Source
This commit is contained in:
paulbeach 2007-12-27 10:55:58 +00:00
parent 55fe6659e5
commit 4a2f1647fe
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,7 +215,7 @@ FBUTIL_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(FBUTIL_Source
# #
# common/classes # common/classes
FBCLASSES_ClientFiles=alloc.cpp locks.cpp fb_string.cpp timestamp.cpp TempFile.cpp FBCLASSES_ClientFiles=alloc.cpp locks.cpp semaphore.cpp fb_string.cpp timestamp.cpp TempFile.cpp
FBCLASSES_MsgFiles=SafeArg.cpp MsgPrint.cpp BaseStream.cpp FBCLASSES_MsgFiles=SafeArg.cpp MsgPrint.cpp BaseStream.cpp
FBCLASSES_ServerFiles=UserBlob.cpp FBCLASSES_ServerFiles=UserBlob.cpp

19
extern/icu/source/config/mh-darwin vendored
View File

@ -12,6 +12,21 @@ SHAREDLIBCPPFLAGS =
# Pad out the paths to the maximum possible length # Pad out the paths to the maximum possible length
LD_FLAGS += -headerpad_max_install_names LD_FLAGS += -headerpad_max_install_names
# Set CFLAGS and CXXFLAGS for relevant MacOS architecture
# and backwards compatibility. Set accordingly before building.
# 64 bit Leopard - intel (MacOS 10.5)
#CFLAGS += -arch x86_64
#CXXFLAGS += -arch x86_64
# 32bit intel default
# DARWIN flag added because of problem with putil.c
CFLAGS += -arch i386 -mmacosx-version-min=10.4 -DDARWIN
CXXFLAGS += -arch i386 -mmacosx-version-min=10.4
# 32 bit powerpc
#CFLAGS += -arch ppc -mmacosx-version-min=10.2
#CXXFLAGS += -arch ppc -mmacosx-version-min=10.2
## Commands to generate dependency files ## Commands to generate dependency files
GEN_DEPS.c= $(CC) -E -MMD $(DEFS) $(CPPFLAGS) GEN_DEPS.c= $(CC) -E -MMD $(DEFS) $(CPPFLAGS)
GEN_DEPS.cc= $(CXX) -E -MMD $(DEFS) $(CPPFLAGS) GEN_DEPS.cc= $(CXX) -E -MMD $(DEFS) $(CPPFLAGS)
@ -58,7 +73,7 @@ STATIC_O = ao
@echo "generating dependency information for $<" @echo "generating dependency information for $<"
@$(GEN_DEPS.c) $< > /dev/null @$(GEN_DEPS.c) $< > /dev/null
@mv $@ $@~ @mv $@ $@~
@echo -n "$@ " > $@ # @echo -n "$@ " > $@
@cat < $@~ >> $@ @cat < $@~ >> $@
@-rm $@~ @-rm $@~
@ -66,7 +81,7 @@ STATIC_O = ao
@echo "generating dependency information for $<" @echo "generating dependency information for $<"
@$(GEN_DEPS.cc) $< >/dev/null @$(GEN_DEPS.cc) $< >/dev/null
@mv $@ $@~ @mv $@ $@~
@echo -n "$@ " > $@ # @echo -n "$@ " > $@
@cat < $@~ >> $@ @cat < $@~ >> $@
@-rm $@~ @-rm $@~

4
src/common/classes/semaphore.h
View File

@ -171,10 +171,10 @@ public:
{ {
fb_assert(init == true); fb_assert(init == true);
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
{
if (sem_post(sem) == -1) if (sem_post(sem) == -1)
{
system_call_failed::raise("semaphore.h: release: sem_post()"); system_call_failed::raise("semaphore.h: release: sem_post()");
} }
} }
#ifdef HAVE_SEM_TIMEDWAIT #ifdef HAVE_SEM_TIMEDWAIT