Skip to content

Instantly share code, notes, and snippets.

@avar
Created May 15, 2017 11:44
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save avar/32e7935f0a76c79a9b4ded841612f448 to your computer and use it in GitHub Desktop.
Save avar/32e7935f0a76c79a9b4ded841612f448 to your computer and use it in GitHub Desktop.
$ git diff -U15
diff --git a/git-compat-util.h b/git-compat-util.h
index bd04564a69..38c806acff 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -119,30 +119,37 @@
#define decimal_length(x) ((int)(sizeof(x) * 2.56 + 0.5) + 1)
#if defined(__sun__)
/*
* On Solaris, when _XOPEN_EXTENDED is set, its header file
* forces the programs to be XPG4v2, defeating any _XOPEN_SOURCE
* setting to say we are XPG5 or XPG6. Also on Solaris,
* XPG6 programs must be compiled with a c99 compiler, while
* non XPG6 programs must be compiled with a pre-c99 compiler.
*/
# if __STDC_VERSION__ - 0 >= 199901L
# define _XOPEN_SOURCE 600
# else
# define _XOPEN_SOURCE 500
# endif
+
+/*
+ * On Solaris (and Illumos and friends) the isa_defs.h header defines
+ * _BIG_ENDIAN which is needed by e.g. sha1dc.
+ */
+#include <sys/isa_defs.h>
+
#elif !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__USLC__) && \
!defined(_M_UNIX) && !defined(__sgi) && !defined(__DragonFly__) && \
!defined(__TANDEM) && !defined(__QNX__) && !defined(__MirBSD__) && \
!defined(__CYGWIN__)
#define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */
#define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */
#endif
#define _ALL_SOURCE 1
#define _GNU_SOURCE 1
#define _BSD_SOURCE 1
#define _DEFAULT_SOURCE 1
#define _NETBSD_SOURCE 1
#define _SGI_SOURCE 1
#if defined(WIN32) && !defined(__CYGWIN__) /* Both MinGW and MSVC */
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment