Merge branch 'jt/pushinsteadof'

[git.git] / git-compat-util.h

diff --git a/git-compat-util.h b/git-compat-util.h
index 9f941e42b16d927f738b4911b41344dd2f3ed0da..e5e9f39c5678e97c69fe5314a964858ed5412163 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -57,10 +57,8 @@
 # endif
 #elif !defined(__APPLE__) && !defined(__FreeBSD__)  && !defined(__USLC__) && !defined(_M_UNIX) && !defined(sgi)
 #define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */
-#ifndef __sun__
 #define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */
 #endif
-#endif
 #define _ALL_SOURCE 1
 #define _GNU_SOURCE 1
 #define _BSD_SOURCE 1
@@ -176,6 +174,8 @@ extern char *gitbasename(char *);
 #endif
 #endif
 
+#include "compat/bswap.h"
+
 /* General helper functions */
 extern void usage(const char *err) NORETURN;
 extern void die(const char *err, ...) NORETURN __attribute__((format (printf, 1, 2)));