Skip to content

V
vlc-2-2
Commit cd5d7f63 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Remove HAVE_ATTRIBUTE_VISIBILITY - refs #297

parent 0724e042
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 32 deletions
include/vlc_common.h
View file @ cd5d7f63
...@@ -387,38 +387,20 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */ ...@@ -387,38 +387,20 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */
* Plug-in stuff * Plug-in stuff
*****************************************************************************/ *****************************************************************************/
#ifdef __cplusplus
# define LIBVLC_EXTERN extern "C"
#else
# define LIBVLC_EXTERN extern
#endif
#if defined (WIN32) && defined (DLL_EXPORT) #if defined (WIN32) && defined (DLL_EXPORT)
# ifdef __cplusplus # define LIBVLC_EXPORT __declspec(dllexport)
# define VLC_PUBLIC_API extern "C" __declspec(dllexport)
# define VLC_PRIVATE_API extern "C" __declspec(dllexport)
# define VLC_EXPORT( type, name, args ) extern "C" __declspec(dllexport) type name args
# else
# define VLC_PUBLIC_API extern __declspec(dllexport)
# define VLC_PRIVATE_API extern __declspec(dllexport)
# define VLC_EXPORT( type, name, args ) __declspec(dllexport) type name args
# endif
#else #else
# ifdef __cplusplus # define LIBVLC_EXPORT
# ifdef HAVE_ATTRIBUTE_VISIBILITY
# define VLC_PUBLIC_API extern "C" __attribute__((visibility("default")))
# define VLC_PRIVATE_API extern "C" __attribute__((visibility("default")))
# define VLC_EXPORT( type, name, args ) extern "C" __attribute__((visibility("default"))) type name args
# else
# define VLC_PUBLIC_API extern "C"
# define VLC_EXPORT( type, name, args ) extern "C" type name args
# endif
# else
# ifdef HAVE_ATTRIBUTE_VISIBILITY
# define VLC_PUBLIC_API extern __attribute__((visibility("default")))
# define VLC_PRIVATE_API extern __attribute__((visibility("default")))
# define VLC_EXPORT( type, name, args ) __attribute__((visibility("default"))) type name args
# else
# define VLC_PUBLIC_API extern
# define VLC_PRIVATE_API extern
# define VLC_EXPORT( type, name, args ) extern type name args
# endif
# endif
#endif #endif
#define VLC_PUBLIC_API LIBVLC_EXTERN LIBVLC_EXPORT
#define VLC_PRIVATE_API LIBVLC_EXTERN LIBVLC_EXPORT /* FIXME: dubious! */
#define VLC_EXPORT( type, name, args ) \
LIBVLC_EXTERN LIBVLC_EXPORT type name args
/***************************************************************************** /*****************************************************************************
* OS-specific headers and thread types * OS-specific headers and thread types
......
include/vlc_plugin.h
View file @ cd5d7f63
...@@ -66,9 +66,6 @@ ...@@ -66,9 +66,6 @@
#if defined( __PLUGIN__ ) && ( defined( WIN32 ) || defined( UNDER_CE ) ) #if defined( __PLUGIN__ ) && ( defined( WIN32 ) || defined( UNDER_CE ) )
# define DLL_SYMBOL __declspec(dllexport) # define DLL_SYMBOL __declspec(dllexport)
# define CDECL_SYMBOL __cdecl # define CDECL_SYMBOL __cdecl
#elif defined (HAVE_ATTRIBUTE_VISIBILITY)
# define DLL_SYMBOL __attribute__((visibility("default")))
# define CDECL_SYMBOL
#else #else
# define DLL_SYMBOL # define DLL_SYMBOL
# define CDECL_SYMBOL # define CDECL_SYMBOL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment