diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2012-03-03 00:20:00 -0800 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2012-03-03 00:20:00 -0800 |
commit | dab7531eccdb5b22368797ae7958471401d1e427 (patch) | |
tree | 1cf5916c4f8f0f97b286fc55e9c2b7aa5b724a4c | |
parent | 2547c6c81fbf751e22ab7dcafdc1d1b50c8562a3 (diff) | |
download | zlib-dab7531eccdb5b22368797ae7958471401d1e427.tar.gz |
Simplify test and use of gcc hidden attribute.
-rwxr-xr-x | configure | 10 | ||||
-rw-r--r-- | gzguts.h | 2 | ||||
-rw-r--r-- | zutil.h | 2 |
3 files changed, 5 insertions, 9 deletions
@@ -638,11 +638,7 @@ fi if test "$gcc" -eq 1; then echo >> configure.log cat > $test.c <<EOF -#if ((__GNUC__-0) * 100 + __GNUC_MINOR__-0 >= 303) -# define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) -#else -# define ZLIB_INTERNAL -#endif +#define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) int ZLIB_INTERNAL foo; int main() { @@ -650,10 +646,10 @@ int main() } EOF if tryboth $CC -c $CFLAGS $test.c; then + CFLAGS="$CFLAGS -DHAVE_HIDDEN" + SFLAGS="$SFLAGS -DHAVE_HIDDEN" echo "Checking for attribute(visibility) support... Yes." | tee -a configure.log else - CFLAGS="$CFLAGS -DNO_VIZ" - SFLAGS="$SFLAGS -DNO_VIZ" echo "Checking for attribute(visibility) support... No." | tee -a configure.log fi fi @@ -12,7 +12,7 @@ # endif #endif -#if ((__GNUC__-0) * 100 + __GNUC_MINOR__-0) >= 303 && !defined(NO_VIZ) +#ifdef HAVE_HIDDEN # define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) #else # define ZLIB_INTERNAL @@ -13,7 +13,7 @@ #ifndef ZUTIL_H #define ZUTIL_H -#if ((__GNUC__-0) * 100 + __GNUC_MINOR__-0) >= 303 && !defined(NO_VIZ) +#ifdef HAVE_HIDDEN # define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) #else # define ZLIB_INTERNAL |