--- OLD/git-compat-util.h	Thu Jan  1 00:00:00 1970
+++ NEW/git-compat-util.h	Thu Jan  1 00:00:00 1970
@@ -42,30 +42,32 @@
 /* Approximation of the length of the decimal representation of this type. */
 #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
-#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
-#define _NETBSD_SOURCE 1
-#define _SGI_SOURCE 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
+//#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
+//#define _NETBSD_SOURCE 1
+//#define _SGI_SOURCE 1
+//typedef unsigned long long int uintmax_t;
+//typedef long long int intmax_t;
 
 #include <unistd.h>
 #include <stdio.h>
@@ -107,9 +109,9 @@
 #define _XOPEN_SOURCE 600
 #include "compat/cygwin.h"
 #else
-#undef _ALL_SOURCE /* AIX 5.3L defines a struct list with _ALL_SOURCE. */
+//#undef _ALL_SOURCE /* AIX 5.3L defines a struct list with _ALL_SOURCE. */
 #include <grp.h>
-#define _ALL_SOURCE 1
+//#define _ALL_SOURCE 1
 #endif
 #else 	/* __MINGW32__ */
 /* pull in Windows compatibility stuff */