- vlc_common.h: compile fix

5237e0c5 · Damien Fouilleul · e523db51 · 5237e0c5
Commit 5237e0c5 authored Feb 05, 2007 by Damien Fouilleul
Hide whitespace changes
Inline Side-by-side

Showing with 22 additions and 18 deletions

include/vlc_common.h include/vlc_common.h +22 -18

No files found.
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -474,32 +474,36 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
 #if defined (WIN32) && defined (DLL_EXPORT)
 #  ifdef __cplusplus
-#    define VLC_EXPORT( type, name, args ) extern "C" __declspec(dllexport) type name args
+#    define   VLC_EXPORT( type, name, args ) extern "C" __declspec(dllexport) type name args
 #    define VLC_INTERNAL( type, name, args ) extern "C" type name args
 #  else
-#    define VLC_EXPORT( type, name, args ) __declspec(dllexport) type name args
+#    define   VLC_EXPORT( type, name, args ) __declspec(dllexport) type name args
 #    define VLC_INTERNAL( type, name, args ) type name args
 #  endif
-#elif HAVE_ATTRIBUTE_VISIBILITY
-#   ifdef __cplusplus
-#      define VLC_EXPORT( type, name, args ) extern "C" __attribute__((visibility("default"))) type name args
-#      define VLC_INTERNAL( type, name, args ) extern "C" __attribute__((visibility("hidden"))) type name args
-#   else
-#      define VLC_EXPORT( type, name, args ) __attribute__((visibility("default"))) type name args
-#      define VLC_INTERNAL( type, name, args ) __attribute__((visibility("hidden"))) type name args
-#   endif
 #else
 #  if !defined (__PLUGIN__) || defined (HAVE_SHARED_LIBVLC)
-#   ifdef __cplusplus
+#    ifdef __cplusplus
-#      define VLC_EXPORT( type, name, args ) extern "C" type name args
+#      if HAVE_ATTRIBUTE_VISIBILITY
-#   else
+#         define   VLC_EXPORT( type, name, args ) extern "C" __attribute__((visibility("default"))) type name args
-#      define VLC_EXPORT( type, name, args ) type name args
+#         define VLC_INTERNAL( type, name, args ) extern "C" __attribute__((visibility("hidden"))) type name args
-#   endif
+#      else
+#         define   VLC_EXPORT( type, name, args ) extern "C" type name args
+#         define VLC_INTERNAL( type, name, args ) extern "C" type name args
+#      endif
+#    else
+#      if HAVE_ATTRIBUTE_VISIBILITY
+#         define   VLC_EXPORT( type, name, args ) __attribute__((visibility("default"))) type name args
+#         define VLC_INTERNAL( type, name, args ) __attribute__((visibility("hidden"))) type name args
+#      else
+#         define   VLC_EXPORT( type, name, args ) type name args
+#         define VLC_INTERNAL( type, name, args ) type name args
+#      endif
+#    endif
 #  else
-#   define VLC_EXPORT( type, name, args ) struct _u_n_u_s_e_d_
+#    define   VLC_EXPORT( type, name, args ) struct _u_n_u_s_e_d_
-    extern module_symbols_t* p_symbols;
+#    define VLC_INTERNAL( type, name, args ) struct _u_n_u_s_e_d_
+     extern module_symbols_t* p_symbols;
 #  endif
-#  define VLC_INTERNAL( type, name, args ) VLC_EXPORT (type, name, args)
 #endif
 /*****************************************************************************