[Xfce4-commits] <midori:master> Work around G_CONST_RETURN use in unique.h

[Christian Dywan]

Updating branch refs/heads/master
         to 77796803c5d906afc642ed8234e02b0d99d43090 (commit)
       from 8c1461367370d6bace7a2e1fcaae6a7160c7fefb (commit)

commit 77796803c5d906afc642ed8234e02b0d99d43090
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sun Nov 13 20:02:02 2011 +0100

    Work around G_CONST_RETURN use in unique.h

 midori/midori-app.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/midori/midori-app.c b/midori/midori-app.c
index 4c2afc5..c280d6a 100644
--- a/midori/midori-app.c
+++ b/midori/midori-app.c
@@ -37,7 +37,13 @@
 #elif HAVE_UNIQUE
     typedef gpointer MidoriAppInstance;
     #define MidoriAppInstanceNull NULL
+    #if defined(G_DISABLE_DEPRECATED) && !defined(G_CONST_RETURN)
+        #define G_CONST_RETURN
+    #endif
     #include <unique/unique.h>
+    #ifdef G_DISABLE_DEPRECATED
+        #undef G_CONST_RETUTN
+    #endif
     #define MIDORI_UNIQUE_COMMAND 1
 #else
     typedef gint MidoriAppInstance;