[pygobject] remove some left over ifdefs to complete merge of the invoke-rewrite branch



commit bf284c7c47c3e52ab4d8700327a170903e9ebad2
Author: John (J5) Palmieri <johnp redhat com>
Date:   Mon Jul 18 11:04:58 2011 -0400

    remove some left over ifdefs to complete merge of the invoke-rewrite branch

 gi/pygi-cache.h   |    2 --
 gi/pygi-info.c    |    2 --
 gi/pygi-private.h |    5 +----
 gi/pygi.h         |    2 --
 4 files changed, 1 insertions(+), 10 deletions(-)
---
diff --git a/gi/pygi-cache.h b/gi/pygi-cache.h
index 6509149..7331103 100644
--- a/gi/pygi-cache.h
+++ b/gi/pygi-cache.h
@@ -19,7 +19,6 @@
  * USA
  */
 
-#ifdef ENABLE_INVOKE_NG
 #ifndef __PYGI_CACHE_H__
 #define __PYGI_CACHE_H__
 
@@ -169,4 +168,3 @@ PyGICallableCache *_pygi_callable_cache_new (GICallableInfo *callable_info);
 G_END_DECLS
 
 #endif /* __PYGI_CACHE_H__ */
-#endif /* def ENABLE_INVOKE_NG */
diff --git a/gi/pygi-info.c b/gi/pygi-info.c
index 5632511..8729e25 100644
--- a/gi/pygi-info.c
+++ b/gi/pygi-info.c
@@ -38,9 +38,7 @@ _base_info_dealloc (PyGIBaseInfo *self)
 
     g_base_info_unref (self->info);
 
-#ifdef ENABLE_INVOKE_NG
     _pygi_callable_cache_free(self->cache);
-#endif
 
     Py_TYPE( (PyObject *) self)->tp_free ( (PyObject *) self);
 }
diff --git a/gi/pygi-private.h b/gi/pygi-private.h
index 8b27778..28e7997 100644
--- a/gi/pygi-private.h
+++ b/gi/pygi-private.h
@@ -30,10 +30,7 @@
 #include "pygi-property.h"
 #include "pygi-signal-closure.h"
 #include "pygi-invoke.h"
-
-#ifdef ENABLE_INVOKE_NG
-  #include "pygi-cache.h"
-#endif
+#include "pygi-cache.h"
 
 G_BEGIN_DECLS
 #if PY_VERSION_HEX >= 0x03000000
diff --git a/gi/pygi.h b/gi/pygi.h
index c23ab9b..92ef6a5 100644
--- a/gi/pygi.h
+++ b/gi/pygi.h
@@ -43,9 +43,7 @@ typedef struct {
     PyObject_HEAD
     GIBaseInfo *info;
     PyObject *inst_weakreflist;
-#ifdef ENABLE_INVOKE_NG
     PyGICallableCache *cache;
-#endif
 } PyGIBaseInfo;
 
 typedef struct {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]