Commit eb01699c authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

Revert "Remove VLC_PRIVATE_API"

This reverts commit 96cc9c26.

This commit is reverted because we are using a regexp to determine the list of exported symbols in libvlc. However some private symbols start with libvlc_, this produces (here on Mac OS X) a nmedit error about symbols not being found while exported. A solution is to externalize those private symbols, hence using VLC_PUBLIC_API.

Feel free to come up with a better solution.
parent 43b9ba7c
......@@ -390,15 +390,18 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */
#if defined (WIN32) && defined (DLL_EXPORT)
# ifdef __cplusplus
# 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
# ifdef __cplusplus
# 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"
......@@ -407,9 +410,11 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */
# 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
......
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