From f6cfbe16bfc252b46532f699b496e4a41a1a1c22 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 7 Sep 2006 15:17:10 -0700 Subject: [PATCH] Attempt to fix makealias usage for build on Mac OS X. Avoid using fcalias.h or fcaliastail.h on systems which don't support it. Provided solution still generates these files, but does not use them. --- src/fcint.h | 3 ++- src/makealias | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/fcint.h b/src/fcint.h index c50f623..afa37d2 100644 --- a/src/fcint.h +++ b/src/fcint.h @@ -48,7 +48,6 @@ #include #include #include -#include "fcalias.h" #ifndef FC_CONFIG_PATH #define FC_CONFIG_PATH "fonts.conf" @@ -114,6 +113,8 @@ /* slim_internal.h */ #if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) #define FcPrivate __attribute__((__visibility__("hidden"))) +#define HAVE_GNUC_ATTRIBUTE 1 +#include "fcalias.h" #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550) #define FcPrivate __hidden #else /* not gcc >= 3.3 and not Sun Studio >= 8 */ diff --git a/src/makealias b/src/makealias index ebbe559..02167b2 100755 --- a/src/makealias +++ b/src/makealias @@ -4,6 +4,7 @@ shift HEAD=fcalias.h TAIL=fcaliastail.h rm -f $HEAD $TAIL +echo "#if HAVE_GNUC_ATTRIBUTE" >> $TAIL cat "$@" | grep '^Fc[^ ]* *(' | sed -e 's/ *(.*$//' | while read name; do case $name in @@ -22,3 +23,4 @@ while read name; do ;; esac done +echo "#endif" >> $TAIL