diff options
| author | Neil Mushell <nmushell@bloomberg.net> | 2015-11-02 21:12:24 +0100 |
|---|---|---|
| committer | Joel Rosdahl <joel@rosdahl.net> | 2015-11-02 21:12:24 +0100 |
| commit | 9485354a5542f901dbca9f96930d036bdbdaaf8b (patch) | |
| tree | 9fde65d0dedaa664d2f9d5f1edc4ae5d0e76fbc6 | |
| parent | b76d92e57756b9b6903964b497d91c4f4e83d812 (diff) | |
| download | ccache-9485354a5542f901dbca9f96930d036bdbdaaf8b.tar.gz | |
Fix build on Solaris 10+ and AIX 7
| -rw-r--r-- | ccache.h | 2 | ||||
| -rw-r--r-- | m4/feature_macros.m4 | 6 |
2 files changed, 6 insertions, 2 deletions
@@ -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 32404943..0243e9f3 100644 --- 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, |