diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2013-07-24 17:44:56 +0800 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2013-08-19 22:44:45 +0100 |
| commit | aa878ddca6a0c1ef99367b5dcae00ce51b4e4b2b (patch) | |
| tree | 775ab9dc9da3696bd955288454940c8e5d403e55 /cogl-path | |
| parent | d87a0b08d6227fb19256f088afdbd24be506c41e (diff) | |
| download | cogl-aa878ddca6a0c1ef99367b5dcae00ce51b4e4b2b.tar.gz | |
Fix the placement of deprecation macros
The deprecation macros, which expand to __declspec (deprecated) on Visual
Studio, is expected to be before the return type of the function which
is annotated by them, and having the deprecation macros there is also
accepted by GCC as well.
This will fix the builds of all applications/libraries using Cogl under
Visual Studio,
Reviewed-by: Robert Bragg <robert@linux.intel.com>
Diffstat (limited to 'cogl-path')
| -rw-r--r-- | cogl-path/cogl1-path-functions.h | 8 | ||||
| -rw-r--r-- | cogl-path/cogl2-path-functions.h | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/cogl-path/cogl1-path-functions.h b/cogl-path/cogl1-path-functions.h index e3ea8656..ca0c670f 100644 --- a/cogl-path/cogl1-path-functions.h +++ b/cogl-path/cogl1-path-functions.h @@ -435,9 +435,9 @@ cogl_path_copy (CoglPath *path); * Since: 1.0 * Deprecated: 1.16: Use cogl_framebuffer_push_path_clip() instead */ +COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_path_clip) void -cogl_clip_push_from_path_preserve (void) - COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_path_clip); +cogl_clip_push_from_path_preserve (void); /** * cogl_clip_push_from_path: @@ -450,9 +450,9 @@ cogl_clip_push_from_path_preserve (void) * Since: 1.0 * Deprecated: 1.16: Use cogl_framebuffer_push_path_clip() instead */ +COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_path_clip) void -cogl_clip_push_from_path (void) - COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_path_clip); +cogl_clip_push_from_path (void); COGL_END_DECLS diff --git a/cogl-path/cogl2-path-functions.h b/cogl-path/cogl2-path-functions.h index 9632ecd5..e2b01c8e 100644 --- a/cogl-path/cogl2-path-functions.h +++ b/cogl-path/cogl2-path-functions.h @@ -444,11 +444,11 @@ cogl_path_fill (CoglPath *path); * Stability: unstable * Deprecated: 1.16: Use cogl_path_fill() instead */ +COGL_DEPRECATED_IN_1_16_FOR (cogl_path_fill) void cogl_framebuffer_fill_path (CoglFramebuffer *framebuffer, CoglPipeline *pipeline, - CoglPath *path) - COGL_DEPRECATED_IN_1_16_FOR (cogl_path_fill); + CoglPath *path); #define cogl_path_stroke cogl2_path_stroke /** @@ -476,11 +476,11 @@ cogl_path_stroke (CoglPath *path); * Stability: unstable * Deprecated: 1.16: Use cogl_path_stroke() instead */ +COGL_DEPRECATED_IN_1_16_FOR (cogl_path_stroke) void cogl_framebuffer_stroke_path (CoglFramebuffer *framebuffer, CoglPipeline *pipeline, - CoglPath *path) - COGL_DEPRECATED_IN_1_16_FOR (cogl_path_stroke); + CoglPath *path); /** * cogl_framebuffer_push_path_clip: @@ -513,9 +513,9 @@ cogl_framebuffer_push_path_clip (CoglFramebuffer *framebuffer, * Stability: Unstable * Deprecated: 1.16: Use cogl_framebuffer_push_path_clip() instead */ +COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_path_clip) void -cogl_clip_push_from_path (CoglPath *path) - COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_path_clip); +cogl_clip_push_from_path (CoglPath *path); COGL_END_DECLS |