Default to use the visibility attribute, on gcc (is this okay?)

libsdl-org · Mar 22, 2006 · 55d5ac5 · 55d5ac5
1 parent c04db0e
commit 55d5ac5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 17 deletions.
diff --git a/configure.in b/configure.in
@@ -719,7 +719,7 @@ CheckVisibilityHidden()
     CFLAGS="$save_CFLAGS"
 
     if test x$have_gcc_fvisibility = xyes; then
-        EXTRA_CFLAGS="$EXTRA_CFLAGS $visibility_CFLAGS -DDECLSPEC=SDL_GCC_ATTR_VIS_DEFAULT"
+        EXTRA_CFLAGS="$EXTRA_CFLAGS $visibility_CFLAGS"
     fi
 }
 

diff --git a/include/begin_code.h b/include/begin_code.h
@@ -31,44 +31,40 @@
 #endif
 #define _begin_code_h
 
-#ifdef __GNUC__
-#define SDL_GCC_ATTR_VIS_DEFAULT __attribute__((visibility("default")))
-#endif
-
 /* Some compilers use a special export keyword */
 #ifndef DECLSPEC
-# ifdef __BEOS__
+# if defined(__BEOS__)
 #  if defined(__GNUC__)
 #   define DECLSPEC	__declspec(dllexport)
 #  else
 #   define DECLSPEC	__declspec(export)
 #  endif
-# else
-# ifdef __WIN32__
+# elif defined(__WIN32__)
 #  ifdef __BORLANDC__
 #   ifdef BUILD_SDL
 #    define DECLSPEC 
 #   else
-#    define DECLSPEC __declspec(dllimport)
+#    define DECLSPEC	__declspec(dllimport)
 #   endif
 #  else
 #   define DECLSPEC	__declspec(dllexport)
 #  endif
-# else
-# ifdef __OS2__
+# elif defined(__OS2__)
 #  ifdef __WATCOMC__
 #   ifdef BUILD_SDL
-#    define DECLSPEC __declspec(dllexport)
+#    define DECLSPEC	__declspec(dllexport)
 #   else
-#  define DECLSPEC
-# endif
+#    define DECLSPEC
+#   endif
 #  else
 #   define DECLSPEC
 #  endif
 # else
-#  define DECLSPEC
-# endif
-# endif
+#  if defined(__GNUC__)
+#   define DECLSPEC	__attribute__ ((visibility("default")))
+#  else
+#   define DECLSPEC
+#  endif
 # endif
 #endif