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

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

Revision: 59816
          http://sourceforge.net/p/firebird/code/59816
Author:   alexpeshkoff
Date:     2014-07-03 07:54:48 +0000 (Thu, 03 Jul 2014)
Log Message:
-----------
Frontported fix for linux build regression

Modified Paths:
--------------
    firebird/trunk/configure.ac
    firebird/trunk/src/jrd/os/posix/unix.cpp

Modified: firebird/trunk/configure.ac
===================================================================
--- firebird/trunk/configure.ac	2014-07-03 07:48:17 UTC (rev 59815)
+++ firebird/trunk/configure.ac	2014-07-03 07:54:48 UTC (rev 59816)
@@ -833,6 +833,9 @@
 AC_CHECK_FUNCS(pthread_cancel)
 AC_CHECK_FUNCS(sigset)
 
+dnl Check for fallocate() system call
+AC_CHECK_FUNCS(fallocate)
+
 dnl Semaphores
 if test "$ac_cv_header_semaphore_h" = "yes"; then
 AC_SEARCH_LIBS(sem_init, rt pthread)

Modified: firebird/trunk/src/jrd/os/posix/unix.cpp
===================================================================
--- firebird/trunk/src/jrd/os/posix/unix.cpp	2014-07-03 07:48:17 UTC (rev 59815)
+++ firebird/trunk/src/jrd/os/posix/unix.cpp	2014-07-03 07:54:48 UTC (rev 59816)
@@ -307,7 +307,7 @@
  *
  **************************************/
 
-#ifdef HAVE_LINUX_FALLOC_H
+#if defined(HAVE_LINUX_FALLOC_H) && defined(HAVE_FALLOCATE)
 	ULONG leftPages = extPages;
 	for (jrd_file* file = main_file; file && leftPages; file = file->fil_next)
 	{
@@ -354,7 +354,7 @@
 	}
 #else
 	main_file->fil_flags |= FIL_no_fast_extend;
-#endif // HAVE_LINUX_FALLOC_H
+#endif // fallocate present
 
 	// not implemented
 	return;

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