summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-09-25 00:13:25 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:38:53 -0500
commitea801d6520287fed76c3aa3a3d1a729f649baa16 (patch)
tree9253206a8fd7c391bcf56fb18b9877ce37f99d04
parent6e99b959dedcd8da444fca04832011ffa744b619 (diff)
downloadsamba-ea801d6520287fed76c3aa3a3d1a729f649baa16.tar.gz
samba-ea801d6520287fed76c3aa3a3d1a729f649baa16.tar.bz2
samba-ea801d6520287fed76c3aa3a3d1a729f649baa16.zip
r10484: try to fix the pread/pwrite declaration problems
(This used to be commit 196995ea38414ce5a57031c4cdf61b3ed548196a)
-rw-r--r--source4/lib/tdb/common/tdb_private.h8
-rw-r--r--source4/lib/tdb/config.m42
-rw-r--r--source4/lib/tdb/configure.in1
3 files changed, 3 insertions, 8 deletions
diff --git a/source4/lib/tdb/common/tdb_private.h b/source4/lib/tdb/common/tdb_private.h
index bfd8d04448..d7471537d8 100644
--- a/source4/lib/tdb/common/tdb_private.h
+++ b/source4/lib/tdb/common/tdb_private.h
@@ -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
diff --git a/source4/lib/tdb/config.m4 b/source4/lib/tdb/config.m4
index 52daf7a8ea..58fdc02eb9 100644
--- a/source4/lib/tdb/config.m4
+++ b/source4/lib/tdb/config.m4
@@ -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>])
diff --git a/source4/lib/tdb/configure.in b/source4/lib/tdb/configure.in
index 4e5c42c351..ba988b5061 100644
--- a/source4/lib/tdb/configure.in
+++ b/source4/lib/tdb/configure.in
@@ -4,6 +4,5 @@ AC_INIT(include/tdb.h)
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)