Fix build on Solaris 10+ and AIX 7

diff --git a/ccache.h b/ccache.h
index 0015c5019d93e49c43631c77f99d5e13b08e64e9..1354423c4373a1f22940e958faf8da0f95d2bc77 100644 (file)
--- a/ccache.h
+++ b/ccache.h
@@ -276,6 +276,8 @@ void add_exe_ext_if_no_to_fullpath(char *full_path_win_ext, size_t max_size,
 #    define PATH_DELIM ":"
 #endif
 
+#ifndef MAX
 #define MAX(a, b) (((a) > (b)) ? (a) : (b))
+#endif
 
 #endif /* ifndef CCACHE_H */

diff --git a/m4/feature_macros.m4 b/m4/feature_macros.m4
index 3240494398ec9ac425d56adaba1a60d01c61c28f..0243e9f34507ddcee22a4759a351e5d660d6146c 100644 (file)
--- a/m4/feature_macros.m4
+++ b/m4/feature_macros.m4
@@ -95,7 +95,7 @@ case $ac_sys_system/$ac_sys_release in
   # or has another value. By not (re)defining it, the defaults come in place.
   AIX/4)
     define_xopen_source=no;;
-  AIX/5)
+  AIX/5|AIX/7)
     if test `uname -r` -eq 1; then
       define_xopen_source=no
     fi
@@ -132,7 +132,9 @@ then
   # except for Solaris 10, where it must not be defined,
   # as it implies XPG4.2
   case $ac_sys_system/$ac_sys_release in
-    SunOS/5.10)
+    SunOS/5.10|SunOS/5.11)
+      AC_DEFINE(__EXTENSIONS__, 1,
+                Define to activate Unix95-and-earlier features)
       ;;
     *)
       AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1,