[SCM] CTDB repository - branch master updated - ctdb-1.12-159-gee3ef90

Ronnie Sahlberg sahlberg at samba.org
Mon Jan 30 21:07:38 MST 2012


The branch, master has been updated
       via  ee3ef9004be8feeefa6e450eb5bb084cc6812370 (commit)
       via  c75e4ad9b566e47dec66d25988da4cee861c2357 (commit)
      from  488de939b78125ac38822760102e05298a5e70c5 (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ee3ef9004be8feeefa6e450eb5bb084cc6812370
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Tue Dec 6 22:24:26 2011 +0100

    Define ETIME on non-supporting platforms
    
    e.g. kFreeBSD, NetBSD, ...

commit c75e4ad9b566e47dec66d25988da4cee861c2357
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Tue Dec 6 22:26:42 2011 +0100

    Add kFreeBSD support

-----------------------------------------------------------------------

Summary of changes:
 common/{system_gnu.c => system_kfreebsd.c} |    4 ++--
 configure.ac                               |    9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)
 copy common/{system_gnu.c => system_kfreebsd.c} (99%)


Changeset truncated at 500 lines:

diff --git a/common/system_gnu.c b/common/system_kfreebsd.c
similarity index 99%
copy from common/system_gnu.c
copy to common/system_kfreebsd.c
index 604bb48..a6cd148 100644
--- a/common/system_gnu.c
+++ b/common/system_kfreebsd.c
@@ -19,8 +19,8 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 
-  This file is a copy of 'common/system_linux.c' adapted for Hurd needs,
-  and inspired by 'common/system_aix.c' for the pcap usage.
+  This file is a copy of 'common/system_linux.c' adapted for Hurd^W kFreeBSD
+  needs, and inspired by 'common/system_aix.c' for the pcap usage.
 */
 
 #include "includes.h"
diff --git a/configure.ac b/configure.ac
index 9f54624..8a3bd7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,11 @@ case `uname` in
     CTDB_SCSI_IO=
     CTDB_PCAP_LDFLAGS=-lpcap
     ;;
+  GNU/kFreeBSD)
+    CTDB_SYSTEM_OBJ=common/system_kfreebsd.o
+    CTDB_SCSI_IO=
+    CTDB_PCAP_LDFLAGS=-lpcap
+    ;;
   GNU)
     CTDB_SYSTEM_OBJ=common/system_gnu.o
     CTDB_SCSI_IO=
@@ -80,6 +85,10 @@ AC_CHECK_HEADERS(pcp/pmapi.h pcp/impl.h pcp/pmda.h, [], [],
 #endif
 ]])
 
+AC_CHECK_DECL([ETIME], [],[AC_DEFINE([ETIME], ETIMEDOUT, [ETIME on non-supporting platforms])], [
+#include <errno.h>
+])
+
 AC_CHECK_FUNCS(sched_setscheduler)
 AC_CHECK_FUNCS(mlockall)
 


-- 
CTDB repository


More information about the samba-cvs mailing list