summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2011-12-15 17:55:20 -0500
committerBarry Warsaw <barry@python.org>2011-12-15 17:55:20 -0500
commit8e87ac365f6b08c0617985488dd5d27148c9281d (patch)
tree3e832777217698a627964b7732e3b017588534dd
parentf2909c23abc4f8fa55d71673785f8e70a843f6ce (diff)
downloaddbus-python-8e87ac365f6b08c0617985488dd5d27148c9281d.tar.gz
Consistency; clean-up.
-rw-r--r--_dbus_bindings/abstract.c8
-rw-r--r--_dbus_bindings/bytes.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/_dbus_bindings/abstract.c b/_dbus_bindings/abstract.c
index 5c21730..2ea655a 100644
--- a/_dbus_bindings/abstract.c
+++ b/_dbus_bindings/abstract.c
@@ -517,9 +517,9 @@ PyTypeObject DBusPyBytesBase_Type = {
/* Support code for str subclasses ================================== */
#ifdef PY3
-#define DBUS_STRING_BASE PyUnicode_Type
+#define DBUS_STRING_BASE (PyUnicode_Type)
#else
-#define DBUS_STRING_BASE PyBytes_Type
+#define DBUS_STRING_BASE (PyBytes_Type)
#endif
PyDoc_STRVAR(DBusPythonString_tp_doc,\
@@ -769,12 +769,12 @@ PyObject *dbus_py_signature_const = NULL;
PyObject *dbus_py__dbus_object_path__const = NULL;
#ifdef PY3
-#define INTERN PyUnicode_InternFromString
+#define INTERN (PyUnicode_InternFromString)
#else
/* Neither Python 2.6 nor 2.7 define the expected PyBytes_InternFromString
* alias in bytesobject.h.
*/
-#define INTERN PyString_InternFromString
+#define INTERN (PyString_InternFromString)
#endif
dbus_bool_t
diff --git a/_dbus_bindings/bytes.c b/_dbus_bindings/bytes.c
index ba93e00..e9bc55d 100644
--- a/_dbus_bindings/bytes.c
+++ b/_dbus_bindings/bytes.c
@@ -32,9 +32,9 @@
#include "types-internal.h"
#ifdef PY3
-#define DBUS_BYTES_BASE DBusPyLongBase_Type
+#define DBUS_BYTES_BASE (DBusPyLongBase_Type)
#else
-#define DBUS_BYTES_BASE DBusPyIntBase_Type
+#define DBUS_BYTES_BASE (DBusPyIntBase_Type)
#endif
PyDoc_STRVAR(Byte_tp_doc,
@@ -217,9 +217,9 @@ PyTypeObject DBusPyByte_Type = {
};
#ifdef PY3
-#define DBUS_BYTEARRAY_BASE DBusPyBytesBase_Type
+#define DBUS_BYTEARRAY_BASE (DBusPyBytesBase_Type)
#else
-#define DBUS_BYTEARRAY_BASE DBusPyStrBase_Type
+#define DBUS_BYTEARRAY_BASE (DBusPyStrBase_Type)
#endif
PyDoc_STRVAR(ByteArray_tp_doc,