[Firebird-checkins] SF.net SVN: firebird:[53334] firebird/trunk

[<ale...@us...>]

Revision: 53334
          http://firebird.svn.sourceforge.net/firebird/?rev=53334&view=rev
Author:   alexpeshkoff
Date:     2011-07-18 10:57:21 +0000 (Mon, 18 Jul 2011)

Log Message:
-----------
Front-ported Darwin port changes

Modified Paths:
--------------
    firebird/trunk/configure.in
    firebird/trunk/src/common/os/posix/divorce.cpp

Modified: firebird/trunk/configure.in
===================================================================
--- firebird/trunk/configure.in	2011-07-18 03:30:03 UTC (rev 53333)
+++ firebird/trunk/configure.in	2011-07-18 10:57:21 UTC (rev 53334)
@@ -787,7 +787,14 @@
 AC_CHECK_FUNCS(semtimedop)
 AC_CHECK_FUNCS(fegetenv)
 AC_CHECK_FUNCS(strerror_r)
-AC_CHECK_FUNCS(fdatasync fsync)
+case $host in
+	*-darwin*)
+		ac_cv_func_fdatasync=no
+		;;
+	*)
+		AC_CHECK_FUNCS(fdatasync fsync)
+		;;
+esac
 AC_CHECK_FUNCS(poll)
 dnl AC_CHECK_FUNCS(AO_compare_and_swap_full)
 AC_COMPILE_IFELSE(

Modified: firebird/trunk/src/common/os/posix/divorce.cpp
===================================================================
--- firebird/trunk/src/common/os/posix/divorce.cpp	2011-07-18 03:30:03 UTC (rev 53333)
+++ firebird/trunk/src/common/os/posix/divorce.cpp	2011-07-18 10:57:21 UTC (rev 53334)
@@ -99,12 +99,14 @@
 
 	for (fid = 0; fid < NOFILE; fid++)
 	{
-#ifdef MIXED_SEMAPHORE_AND_FILE_HANDLE
-		if (Firebird::SignalSafeSemaphore::checkHandle(fid))
+#ifdef DARWIN
+#ifdef HAVE_UNISTD_H
+		if (isatty(fid) <= 0)
 		{
 			continue;
 		}
 #endif
+#endif
 		if (!(mask & (1 << fid)))
 		{
 			close(fid);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.