Merge 2-1

diff --combined include/atalk/adouble.h
index 6d7e51a4e27f452f696001c3adc40854ebc37715,7f10c1d6889dba3f5a4acfe07ff8f88a82800c3c..18422eca680dc89c2950813d36cfe7ff97b50073
--- 1/include/atalk/adouble.h
--- 2/include/atalk/adouble.h
+++ b/include/atalk/adouble.h
@@@ -56,10 -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>
@@@ -76,9 -77,7 +76,7 @@@
  #include <fcntl.h>
  #endif
  
- #ifdef USE_MMAPPED_HEADERS
  #include <sys/mman.h>
- #endif
  
  #ifdef HAVE_SYS_TIME_H
  #include <sys/time.h>