Merge 2-1

[netatalk.git] / include / atalk / adouble.h

diff --git a/include/atalk/adouble.h b/include/atalk/adouble.h
index 2da89868178302ea4e5b6af9c94988516e9168d0..18422eca680dc89c2950813d36cfe7ff97b50073 100644 (file)
--- a/include/atalk/adouble.h
+++ b/include/atalk/adouble.h
@@ -56,11 +56,10 @@
   need _XOPEN_SOURCE defined for pread.
 */
 #if defined(HAVE_PREAD) && !defined(SOLARIS) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(TRU64)
-#ifdef _XOPEN_SOURCE
-#undef _XOPEN_SOURCE
-#endif
+#ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 500
 #endif
+#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -77,9 +76,7 @@
 #include <fcntl.h>
 #endif
 
-#ifdef USE_MMAPPED_HEADERS
 #include <sys/mman.h>
-#endif
 
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>