[clutter/clutter-1.18] Use _CLUTTER_EXTERN to define CLUTTER_VAR
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/clutter-1.18] Use _CLUTTER_EXTERN to define CLUTTER_VAR
- Date: Tue, 18 Mar 2014 14:27:32 +0000 (UTC)
commit 3b21999494a7196f1d3c7d5297d4abed39a98ec7
Author: Emmanuele Bassi <ebassi gnome org>
Date: Mon Mar 17 18:43:08 2014 +0000
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.
clutter/clutter-version.h.in | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
---
diff --git a/clutter/clutter-version.h.in b/clutter/clutter-version.h.in
index a308920..0afdc70 100644
--- a/clutter/clutter-version.h.in
+++ b/clutter/clutter-version.h.in
@@ -254,21 +254,12 @@ G_BEGIN_DECLS
(CLUTTER_MAJOR_VERSION == (major) && CLUTTER_MINOR_VERSION > (minor)) || \
(CLUTTER_MAJOR_VERSION == (major) && CLUTTER_MINOR_VERSION == (minor) && CLUTTER_MICRO_VERSION >=
(micro)))
-/* annotation for exported variables
- *
- * 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
+#ifndef _CLUTTER_EXTERN
+#define _CLUTTER_EXTERN extern
#endif
+#define CLUTTER_VAR _CLUTTER_EXTERN
+
/**
* clutter_major_version:
*
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]