brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2.0: Remove unnecessary symbols

Browse Source
This commit is contained in:
Emmanuele Bassi 2012-08-27 10:09:57 +01:00
parent b4410c5523
commit 4a7ebde571
3 changed files with 29 additions and 296 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

167
clutter/clutter-macros.h
View File

@ -28,58 +28,6 @@
#include <clutter/clutter-version.h>
/**
* CLUTTER_FLAVOUR:
*
* GL Windowing system used
*
*
*
* Deprecated: 1.10: The macro evaluates to "deprecated" as Clutter can be
* compiled with multiple windowing system backends. Use the various
* CLUTTER_WINDOWING_* macros to detect the windowing system that Clutter
* is being compiled against, and the type check macros for the
* #ClutterBackend for a run-time check.
*/
#define CLUTTER_FLAVOUR "deprecated"
/**
* CLUTTER_COGL:
*
* Cogl (internal GL abstraction utility library) backend. Can be "gl" or
* "gles" currently
*
*
*
* Deprecated: 1.10: The macro evaluates to "deprecated" as Cogl can be
* compiled against multiple GL implementations.
*/
#define CLUTTER_COGL "deprecated"
/**
* CLUTTER_STAGE_TYPE:
*
* The default GObject type for the Clutter stage.
*
*
*
* Deprecated: 1.10: The macro evaluates to "deprecated" as Clutter can
* be compiled against multiple windowing systems. You can use the
* CLUTTER_WINDOWING_* macros for compile-time checks, and the type
* check macros for run-time checks.
*/
#define CLUTTER_STAGE_TYPE "deprecated"
/**
* CLUTTER_NO_FPU:
*
* Set to 1 if Clutter was built without FPU (i.e fixed math), 0 otherwise
*
* Deprecated: 0.6: This macro is no longer defined (identical code is used
* regardless the presence of FPU).
*/
#define CLUTTER_NO_FPU (0)
/* some structures are meant to be opaque and still be allocated on the stack;
* in order to avoid people poking at their internals, we use this macro to
* ensure that users don't accidentally access a struct private members.
@ -92,6 +40,21 @@
#define CLUTTER_PRIVATE_FIELD(x) clutter_private_ ## x
#endif
/* 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
#endif
/* these macros are used to mark deprecated functions, and thus have to be
* exposed in a public header.
*
@ -164,102 +127,18 @@
/* XXX: Every new stable minor release should add a set of macros here */
#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_0
# define CLUTTER_DEPRECATED_IN_1_0 CLUTTER_DEPRECATED
# define CLUTTER_DEPRECATED_IN_1_0_FOR(f) CLUTTER_DEPRECATED_FOR(f)
#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_2_0
# define CLUTTER_DEPRECATED_IN_2_0 CLUTTER_DEPRECATED
# define CLUTTER_DEPRECATED_IN_2_0_FOR(f) CLUTTER_DEPRECATED_FOR(f)
#else
# define CLUTTER_DEPRECATED_IN_1_0
# define CLUTTER_DEPRECATED_IN_1_0_FOR(f)
# define CLUTTER_DEPRECATED_IN_2_0
# define CLUTTER_DEPRECATED_IN_2_0_FOR(f)
#endif
#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_0
# define CLUTTER_AVAILABLE_IN_1_0 CLUTTER_UNAVAILABLE(1, 0)
#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_2_0
# define CLUTTER_AVAILABLE_IN_2_0 CLUTTER_UNAVAILABLE(2, 0)
#else
# define CLUTTER_AVAILABLE_IN_1_0
#endif
#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_2
# define CLUTTER_DEPRECATED_IN_1_2 CLUTTER_DEPRECATED
# define CLUTTER_DEPRECATED_IN_1_2_FOR(f) CLUTTER_DEPRECATED_FOR(f)
#else
# define CLUTTER_DEPRECATED_IN_1_2
# define CLUTTER_DEPRECATED_IN_1_2_FOR(f)
#endif
#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_2
# define CLUTTER_AVAILABLE_IN_1_2 CLUTTER_UNAVAILABLE(1, 2)
#else
# define CLUTTER_AVAILABLE_IN_1_2
#endif
#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_4
# define CLUTTER_DEPRECATED_IN_1_4 CLUTTER_DEPRECATED
# define CLUTTER_DEPRECATED_IN_1_4_FOR(f) CLUTTER_DEPRECATED_FOR(f)
#else
# define CLUTTER_DEPRECATED_IN_1_4
# define CLUTTER_DEPRECATED_IN_1_4_FOR(f)
#endif
#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_4
# define CLUTTER_AVAILABLE_IN_1_4 CLUTTER_UNAVAILABLE(1, 4)
#else
# define CLUTTER_AVAILABLE_IN_1_4
#endif
#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_6
# define CLUTTER_DEPRECATED_IN_1_6 CLUTTER_DEPRECATED
# define CLUTTER_DEPRECATED_IN_1_6_FOR(f) CLUTTER_DEPRECATED_FOR(f)
#else
# define CLUTTER_DEPRECATED_IN_1_6
# define CLUTTER_DEPRECATED_IN_1_6_FOR(f)
#endif
#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_6
# define CLUTTER_AVAILABLE_IN_1_6 CLUTTER_UNAVAILABLE(1, 6)
#else
# define CLUTTER_AVAILABLE_IN_1_6
#endif
#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_8
# define CLUTTER_DEPRECATED_IN_1_8 CLUTTER_DEPRECATED
# define CLUTTER_DEPRECATED_IN_1_8_FOR(f) CLUTTER_DEPRECATED_FOR(f)
#else
# define CLUTTER_DEPRECATED_IN_1_8
# define CLUTTER_DEPRECATED_IN_1_8_FOR(f)
#endif
#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_8
# define CLUTTER_AVAILABLE_IN_1_8 CLUTTER_UNAVAILABLE(1, 8)
#else
# define CLUTTER_AVAILABLE_IN_1_8
#endif
#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_10
# define CLUTTER_DEPRECATED_IN_1_10 CLUTTER_DEPRECATED
# define CLUTTER_DEPRECATED_IN_1_10_FOR(f) CLUTTER_DEPRECATED_FOR(f)
#else
# define CLUTTER_DEPRECATED_IN_1_10
# define CLUTTER_DEPRECATED_IN_1_10_FOR(f)
#endif
#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_10
# define CLUTTER_AVAILABLE_IN_1_10 CLUTTER_UNAVAILABLE(1, 10)
#else
# define CLUTTER_AVAILABLE_IN_1_10
#endif
#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_12
# define CLUTTER_DEPRECATED_IN_1_12 CLUTTER_DEPRECATED
# define CLUTTER_DEPRECATED_IN_1_12_FOR(f) CLUTTER_DEPRECATED_FOR(f)
#else
# define CLUTTER_DEPRECATED_IN_1_12
# define CLUTTER_DEPRECATED_IN_1_12_FOR(f)
#endif
#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_1_12
# define CLUTTER_AVAILABLE_IN_1_12 CLUTTER_UNAVAILABLE(1, 12)
#else
# define CLUTTER_AVAILABLE_IN_1_12
# define CLUTTER_AVAILABLE_IN_2_0
#endif
#if CLUTTER_VERSION_MIN_REQUIRED >= CLUTTER_VERSION_1_14

6
clutter/clutter-main.c
View File

@ -170,9 +170,9 @@ guint clutter_pick_debug_flags = 0;
/* profile flags */
guint clutter_profile_flags = 0;
const guint clutter_major_version = CLUTTER_MAJOR_VERSION;
const guint clutter_minor_version = CLUTTER_MINOR_VERSION;
const guint clutter_micro_version = CLUTTER_MICRO_VERSION;
static const guint clutter_major_version = CLUTTER_MAJOR_VERSION;
static const guint clutter_minor_version = CLUTTER_MINOR_VERSION;
static const guint clutter_micro_version = CLUTTER_MICRO_VERSION;
#ifdef CLUTTER_ENABLE_DEBUG
static const GDebugKey clutter_debug_keys[] = {

152
clutter/clutter-version.h.in
View File

@ -98,13 +98,6 @@ G_BEGIN_DECLS
*/
#define CLUTTER_MICRO_VERSION (@CLUTTER_MICRO_VERSION@)
/**
* CLUTTER_VERSION:
*
* The full version of the Clutter library, like 1.2.3
*/
#define CLUTTER_VERSION @CLUTTER_VERSION@
/**
* CLUTTER_VERSION_S:
*
@ -114,106 +107,24 @@ G_BEGIN_DECLS
#define CLUTTER_VERSION_S "@CLUTTER_VERSION@"
/**
* CLUTTER_VERSION_HEX:
* CLUTTER_VERSION:
*
* Numerically encoded version of the Clutter library, like 0x010203
*/
#define CLUTTER_VERSION_HEX ((CLUTTER_MAJOR_VERSION << 24) | \
#define CLUTTER_VERSION ((CLUTTER_MAJOR_VERSION << 24) | \
(CLUTTER_MINOR_VERSION << 16) | \
(CLUTTER_MICRO_VERSION << 8))
/* XXX - Every new stable minor release bump should add a macro here */
/**
* CLUTTER_VERSION_1_0:
* CLUTTER_VERSION_2_0:
*
* A macro that evaluates to the 1.0 version of Clutter, in a format
* that can be used by the C pre-processor.
*
* Since: 1.10
*/
#define CLUTTER_VERSION_1_0 (G_ENCODE_VERSION (1, 0))
/**
* CLUTTER_VERSION_1_2:
*
* A macro that evaluates to the 1.2 version of Clutter, in a format
* that can be used by the C pre-processor.
*
* Since: 1.10
*/
#define CLUTTER_VERSION_1_2 (G_ENCODE_VERSION (1, 2))
/**
* CLUTTER_VERSION_1_4:
*
* A macro that evaluates to the 1.4 version of Clutter, in a format
* that can be used by the C pre-processor.
*
* Since: 1.10
*/
#define CLUTTER_VERSION_1_4 (G_ENCODE_VERSION (1, 4))
/**
* CLUTTER_VERSION_1_6:
*
* A macro that evaluates to the 1.6 version of Clutter, in a format
* that can be used by the C pre-processor.
*
* Since: 1.10
*/
#define CLUTTER_VERSION_1_6 (G_ENCODE_VERSION (1, 6))
/**
* CLUTTER_VERSION_1_8:
*
* A macro that evaluates to the 1.8 version of Clutter, in a format
* that can be used by the C pre-processor.
*
* Since: 1.10
*/
#define CLUTTER_VERSION_1_8 (G_ENCODE_VERSION (1, 8))
/**
* CLUTTER_VERSION_1_10:
*
* A macro that evaluates to the 1.10 version of Clutter, in a format
* that can be used by the C pre-processor.
*
* Since: 1.10
*/
#define CLUTTER_VERSION_1_10 (G_ENCODE_VERSION (1, 10))
/**
* CLUTTER_VERSION_1_12:
*
* A macro that evaluates to the 1.12 version of Clutter, in a format
* that can be used by the C pre-processor.
*
* Since: 1.12
*/
#define CLUTTER_VERSION_1_12 (G_ENCODE_VERSION (1, 12))
/**
* CLUTTER_VERSION_1_14:
*
* A macro that evaluates to the 1.14 version of Clutter, in a format
* that can be used by the C pre-processor.
*
* Since: 1.14
*/
#define CLUTTER_VERSION_1_14 (G_ENCODE_VERSION (1, 14))
/**
* CLUTTER_VERSION_1_16:
*
* A macro that evaluates to the 1.16 version of Clutter, in a format
* that can be used by the C pre-processor.
*
* Since: 1.14
*/
#define CLUTTER_VERSION_1_16 (G_ENCODE_VERSION (1, 16))
/* evaluates to the current stable version; for development cycles,
* this means the next stable target
*/
@ -244,63 +155,6 @@ 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
#endif
/**
* clutter_major_version:
*
* The major component of the Clutter library version, e.g. 1 if the version
* is 1.2.3
*
* This value can be used for run-time version checks
*
* For a compile-time check, use %CLUTTER_MAJOR_VERSION
*
* Since: 1.2
*/
CLUTTER_VAR const guint clutter_major_version;
/**
* clutter_minor_version:
*
* The minor component of the Clutter library version, e.g. 2 if the version
* is 1.2.3
*
* This value can be used for run-time version checks
*
* For a compile-time check, use %CLUTTER_MINOR_VERSION
*
* Since: 1.2
*/
CLUTTER_VAR const guint clutter_minor_version;
/**
* clutter_micro_version:
*
* The micro component of the Clutter library version, e.g. 3 if the version
* is 1.2.3
*
* This value can be used for run-time version checks
*
* For a compile-time check, use %CLUTTER_MICRO_VERSION
*
* Since: 1.2
*/
CLUTTER_VAR const guint clutter_micro_version;
gboolean clutter_check_version (guint major,
guint minor,
guint micro);