From 808821a820b5e13e829e1d8a9edcffca73b5ba37 Mon Sep 17 00:00:00 2001 From: Pierre d'Herbemont Date: Wed, 19 Mar 2008 10:31:46 +0100 Subject: [PATCH] Revert "Fix compilation, by "fixing" VLC_PUBLIC_API." as the compilation breakage on Qt4 was obviously a typo in 461e426f5. This reverts commit 82d39c38faa8a4eaeb613d65d27957321f449c02. --- include/vlc_common.h | 10 +++++----- include/vlc_objects.h | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/include/vlc_common.h b/include/vlc_common.h index bc179a0f4b..1384f90416 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -455,8 +455,8 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */ #if defined (WIN32) && defined (DLL_EXPORT) # ifdef __cplusplus -# define VLC_PUBLIC_API __declspec(dllexport) -# define VLC_PRIVATE_API __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 # define VLC_INTERNAL( type, name, args ) extern "C" type name args # else @@ -468,12 +468,12 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */ #else # ifdef __cplusplus # ifdef HAVE_ATTRIBUTE_VISIBILITY -# define VLC_PUBLIC_API __attribute__((visibility("default"))) -# define VLC_PRIVATE_API __attribute__((visibility("default"))) +# 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 # define VLC_INTERNAL( type, name, args ) extern "C" __attribute__((visibility("hidden"))) type name args # else -# define VLC_PUBLIC_API +# define VLC_PUBLIC_API extern "C" # define VLC_EXPORT( type, name, args ) extern "C" type name args # define VLC_INTERNAL( type, name, args ) extern "C" type name args # endif diff --git a/include/vlc_objects.h b/include/vlc_objects.h index 1115bbef81..0f5bbde69c 100644 --- a/include/vlc_objects.h +++ b/include/vlc_objects.h @@ -86,6 +86,9 @@ /* Types */ typedef void (*vlc_destructor_t)(struct vlc_object_t *); +/* Constants */ +VLC_PUBLIC_API const vlc_destructor_t kVLCDestructor; + /***************************************************************************** * The vlc_object_t type. Yes, it's that simple :-) *****************************************************************************/ -- 2.39.2