Use _CLUTTER_EXTERN to define CLUTTER_VAR

The macro is defined outside of the header, and does all the heavy
lifting of getting the proper attributes.
This commit is contained in:
Emmanuele Bassi 2014-03-17 18:43:08 +00:00
parent c44f73a7f1
commit 3b21999494

View File

@ -254,21 +254,12 @@ G_BEGIN_DECLS
(CLUTTER_MAJOR_VERSION == (major) && CLUTTER_MINOR_VERSION > (minor)) || \ (CLUTTER_MAJOR_VERSION == (major) && CLUTTER_MINOR_VERSION > (minor)) || \
(CLUTTER_MAJOR_VERSION == (major) && CLUTTER_MINOR_VERSION == (minor) && CLUTTER_MICRO_VERSION >= (micro))) (CLUTTER_MAJOR_VERSION == (major) && CLUTTER_MINOR_VERSION == (minor) && CLUTTER_MICRO_VERSION >= (micro)))
/* annotation for exported variables #ifndef _CLUTTER_EXTERN
* #define _CLUTTER_EXTERN extern
* XXX: this has to be defined here because clutter-macro.h imports this
* header file.
*/
#ifdef _MSC_VER
# ifdef CLUTTER_COMPILATION
# define CLUTTER_VAR __declspec(dllexport)
# else
# define CLUTTER_VAR extern __declspec(dllimport)
# endif
#else
# define CLUTTER_VAR extern
#endif #endif
#define CLUTTER_VAR _CLUTTER_EXTERN
/** /**
* clutter_major_version: * clutter_major_version:
* *