svn commit: samba r10484 - in branches/SAMBA_4_0/source/lib/tdb: . common

[tridge at samba.org]

Author: tridge
Date: 2005-09-25 00:13:25 +0000 (Sun, 25 Sep 2005)
New Revision: 10484

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10484

Log:
try to fix the pread/pwrite declaration problems




Modified:
   branches/SAMBA_4_0/source/lib/tdb/common/tdb_private.h
   branches/SAMBA_4_0/source/lib/tdb/config.m4
   branches/SAMBA_4_0/source/lib/tdb/configure.in


Changeset:
Modified: branches/SAMBA_4_0/source/lib/tdb/common/tdb_private.h
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/common/tdb_private.h	2005-09-24 23:52:30 UTC (rev 10483)
+++ branches/SAMBA_4_0/source/lib/tdb/common/tdb_private.h	2005-09-25 00:13:25 UTC (rev 10484)
@@ -25,12 +25,7 @@
 */
 
 #ifndef _SAMBA_BUILD_
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#define _XOPEN_SOURCE 500
-
+#include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
 #ifdef HAVE_STDINT_H
@@ -43,7 +38,6 @@
 #include <errno.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
-#include "config.h"
 #include "tdb.h"
 
 #ifndef HAVE_PREAD_DECL

Modified: branches/SAMBA_4_0/source/lib/tdb/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/config.m4	2005-09-24 23:52:30 UTC (rev 10483)
+++ branches/SAMBA_4_0/source/lib/tdb/config.m4	2005-09-25 00:13:25 UTC (rev 10484)
@@ -1,6 +1,8 @@
 AC_CHECK_FUNCS(mmap pread pwrite getpagesize)
 AC_CHECK_HEADERS(getopt.h)
 
+AC_DEFINE([_GNU_SOURCE],[],[Pull in GNU extensions])
+
 AC_HAVE_DECL(pread, [#include <unistd.h>])
 AC_HAVE_DECL(pwrite, [#include <unistd.h>])
 

Modified: branches/SAMBA_4_0/source/lib/tdb/configure.in
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/configure.in	2005-09-24 23:52:30 UTC (rev 10483)
+++ branches/SAMBA_4_0/source/lib/tdb/configure.in	2005-09-25 00:13:25 UTC (rev 10484)
@@ -4,6 +4,5 @@
 AC_CONFIG_HEADER(include/config.h)
 AC_PROG_CC
 AC_FUNC_MMAP
-AC_DEFINE([_GNU_SOURCE],[],[Pull in GNU extensions])
 sinclude(config.m4)
 AC_OUTPUT(Makefile tdb.pc)