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

2.0: Fix up the versioning macros

Browse Source
This commit is contained in:
Emmanuele Bassi 2012-10-07 22:04:21 +01:00
parent 08a36c3e28
commit b4758c3526
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clutter/clutter-macros.h
View File

@ -78,7 +78,7 @@
* clutter.h header. * clutter.h header.
* *
* The definition should be one of the predefined Clutter version macros, * The definition should be one of the predefined Clutter version macros,
* such as: %CLUTTER_VERSION_1_0, %CLUTTER_VERSION_1_2, ... * such as: %CLUTTER_VERSION_2_0, %CLUTTER_VERSION_2_2, ...
* *
* This macro defines the lower bound for the Clutter API to be used. * This macro defines the lower bound for the Clutter API to be used.
* *
@ -89,7 +89,11 @@
* *
*/ */
#ifndef CLUTTER_VERSION_MIN_REQUIRED #ifndef CLUTTER_VERSION_MIN_REQUIRED
# define CLUTTER_VERSION_MIN_REQUIRED (CLUTTER_VERSION_CUR_STABLE) # if CLUTTER_MAJOR_VERSION < 2
# define CLUTTER_VERSION_MIN_REQUIRED (G_ENCODE_VERSION (2, 0))
# else
# define CLUTTER_VERSION_MIN_REQUIRED (CLUTTER_VERSION_CUR_STABLE)
# endif
#endif #endif
/** /**
@ -99,7 +103,7 @@
* clutter.h header. * clutter.h header.
* *
* The definition should be one of the predefined Clutter version macros, * The definition should be one of the predefined Clutter version macros,
* such as: %CLUTTER_VERSION_1_0, %CLUTTER_VERSION_1_2, ... * such as: %CLUTTER_VERSION_2_0, %CLUTTER_VERSION_2_2, ...
* *
* This macro defines the upper bound for the Clutter API to be used. * This macro defines the upper bound for the Clutter API to be used.
* *
@ -121,8 +125,8 @@
#if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_MIN_REQUIRED #if CLUTTER_VERSION_MAX_ALLOWED < CLUTTER_VERSION_MIN_REQUIRED
# error "CLUTTER_VERSION_MAX_ALLOWED must be >= CLUTTER_VERSION_MIN_REQUIRED" # error "CLUTTER_VERSION_MAX_ALLOWED must be >= CLUTTER_VERSION_MIN_REQUIRED"
#endif #endif
#if CLUTTER_VERSION_MIN_REQUIRED < CLUTTER_VERSION_1_0 #if CLUTTER_VERSION_MIN_REQUIRED < CLUTTER_VERSION_2_0
# error "CLUTTER_VERSION_MIN_REQUIRED must be >= CLUTTER_VERSION_1_0" # error "CLUTTER_VERSION_MIN_REQUIRED must be >= CLUTTER_VERSION_2_0"
#endif #endif
/* XXX: Every new stable minor release should add a set of macros here */ /* XXX: Every new stable minor release should add a set of macros here */

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

@ -123,7 +123,7 @@ G_BEGIN_DECLS
* A macro that evaluates to the 1.0 version of Clutter, in a format * A macro that evaluates to the 1.0 version of Clutter, in a format
* that can be used by the C pre-processor. * that can be used by the C pre-processor.
*/ */
#define CLUTTER_VERSION_1_0 (G_ENCODE_VERSION (1, 0)) #define CLUTTER_VERSION_2_0 (G_ENCODE_VERSION (2, 0))
/* evaluates to the current stable version; for development cycles, /* evaluates to the current stable version; for development cycles,
* this means the next stable target * this means the next stable target