gmacros.h: add G_GNUC_*_IGNORE_DEPRECATIONS macros for clang

[platform/upstream/glib.git] / glib / glib.py

diff --git a/glib/glib.py b/glib/glib.py
index 9a47d52..f7fe22b 100644 (file)
--- a/glib/glib.py
+++ b/glib/glib.py
@@ -1,4 +1,8 @@
 import gdb
+import sys
+
+if sys.version_info[0] >= 3:
+    long = int
 
 # This is not quite right, as local vars may override symname
 def read_global_var (symname):
@@ -10,8 +14,15 @@ def g_quark_to_string (quark):
     quark = long(quark)
     if quark == 0:
         return None
-    val = read_global_var ("g_quarks")
-    max_q = long(read_global_var ("g_quark_seq_id"))
+    try:
+        val = read_global_var ("quarks")
+        max_q = long(read_global_var ("quark_seq_id"))
+    except:
+        try:
+            val = read_global_var ("g_quarks")
+            max_q = long(read_global_var ("g_quark_seq_id"))
+        except:
+            return None;
     if quark < max_q:
         return val[quark].string()
     return None
@@ -130,10 +141,6 @@ class GHashPrinter:
         return "map"
 
 def pretty_printer_lookup (val):
-    if is_g_type_instance (val):
-        return GTypePrettyPrinter (val)
-
-def pretty_printer_lookup (val):
     # None yet, want things like hash table and list
 
     type = val.type.unqualified()