try to sort out compile hell

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

diff --git a/include/atalk/adouble.h b/include/atalk/adouble.h
index dbf222bb612b9bac5500807fea7f7841076dadd4..4092ee60c90225b867ed52890e21d8f41e9febb5 100644 (file)
--- a/include/atalk/adouble.h
+++ b/include/atalk/adouble.h
@@ -1,5 +1,5 @@
 /*
- * $Id: adouble.h,v 1.21.6.8 2004-02-07 19:46:08 didg Exp $
+ * $Id: adouble.h,v 1.21.6.10 2004-02-20 19:56:15 didg Exp $
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
  *
@@ -28,9 +28,6 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 
 /* ------------------- 
  * need pread() and pwrite()
@@ -51,10 +48,16 @@
 
 #endif
 
+
+#include <sys/cdefs.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
 #ifdef  HAVE_PREAD
-#ifndef _XOPEN_SOURCE
-#define _XOPEN_SOURCE 500
+#ifdef _XOPEN_SOURCE
+#undef _XOPEN_SOURCE
 #endif
+#define _XOPEN_SOURCE 500
 #endif
 
 #ifdef HAVE_UNISTD_H
@@ -67,10 +70,10 @@
 #include <fcntl.h>
 #endif
 
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/mman.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
 #include <netatalk/endian.h>
 
 /* version info */