summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1998-12-17 01:04:38 +0000
committerAndrew Tridgell <tridge@samba.org>1998-12-17 01:04:38 +0000
commitd973a107a2edac5ee2874eb6fdc005b9d32be379 (patch)
tree214bd055e2bdffd0c11478c551953f344ba98605
parentdc003d8d408b87eecba9044d2d8732a3604827bf (diff)
downloadsamba-d973a107a2edac5ee2874eb6fdc005b9d32be379.tar.gz
samba-d973a107a2edac5ee2874eb6fdc005b9d32be379.tar.bz2
samba-d973a107a2edac5ee2874eb6fdc005b9d32be379.zip
and in head branch:
make sure we include sys/mman.h if available (This used to be commit ccf644388732287da01a943ea826187b5394ebc6)
-rwxr-xr-xsource3/configure2
-rw-r--r--source3/configure.in2
-rw-r--r--source3/include/config.h.in3
-rw-r--r--source3/include/includes.h2
4 files changed, 6 insertions, 3 deletions
diff --git a/source3/configure b/source3/configure
index a6fb9d31e7..e0503e21e3 100755
--- a/source3/configure
+++ b/source3/configure
@@ -1651,7 +1651,7 @@ else
fi
done
-for ac_hdr in sys/wait.h sys/resource.h sys/ioctl.h sys/mode.h
+for ac_hdr in sys/wait.h sys/resource.h sys/ioctl.h sys/mode.h sys/mman.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
diff --git a/source3/configure.in b/source3/configure.in
index be76b4d6de..44982e5afb 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -55,7 +55,7 @@ AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h)
AC_CHECK_HEADERS(sys/param.h ctype.h )
AC_CHECK_HEADERS(unistd.h utime.h grp.h sys/id.h limits.h memory.h net/route.h net/if.h)
AC_CHECK_HEADERS(compat.h rpc/rpc.h rpcsvc/yp_prot.h rpcsvc/ypclnt.h sys/param.h ctype.h )
-AC_CHECK_HEADERS(sys/wait.h sys/resource.h sys/ioctl.h sys/mode.h)
+AC_CHECK_HEADERS(sys/wait.h sys/resource.h sys/ioctl.h sys/mode.h sys/mman.h)
AC_CHECK_HEADERS(sys/filio.h string.h strings.h stdlib.h sys/socket.h)
AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h)
AC_CHECK_HEADERS(sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h sys/sockio.h)
diff --git a/source3/include/config.h.in b/source3/include/config.h.in
index 393a0e679f..44e7b08377 100644
--- a/source3/include/config.h.in
+++ b/source3/include/config.h.in
@@ -723,6 +723,9 @@
/* Define if you have the <sys/ioctl.h> header file. */
#undef HAVE_SYS_IOCTL_H
+/* Define if you have the <sys/mman.h> header file. */
+#undef HAVE_SYS_MMAN_H
+
/* Define if you have the <sys/mode.h> header file. */
#undef HAVE_SYS_MODE_H
diff --git a/source3/include/includes.h b/source3/include/includes.h
index a70de0b3a9..74aabc0b1f 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -223,7 +223,7 @@
# endif
#endif
-#ifdef HAVE_SHARED_MMAP
+#ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h>
#endif