summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2007-07-12 13:13:13 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2007-07-12 13:13:13 +0100
commit07bb7f1de21c64ea1f19ff107910daa2a14ec4ba (patch)
tree5ec7830eb62196a4bcd1cdc6b5da66950dfdd214
parenta94d9d68d17fd5284aa549187ac6fbb29c188efd (diff)
downloaddbus-python-07bb7f1de21c64ea1f19ff107910daa2a14ec4ba.tar.gz
Avoid cpp directives inside macro calls, to be nice to old gcc versions
-rw-r--r--_dbus_bindings/containers.c6
-rw-r--r--_dbus_bindings/int.c14
2 files changed, 1 insertions, 19 deletions
diff --git a/_dbus_bindings/containers.c b/_dbus_bindings/containers.c
index 1355ace..3691a65 100644
--- a/_dbus_bindings/containers.c
+++ b/_dbus_bindings/containers.c
@@ -253,11 +253,7 @@ PyDoc_STRVAR(Dict_tp_doc,
"\n"
"``signature`` is either a string or None. If a string, it must consist\n"
"of exactly two complete type signatures, representing the 'key' type\n"
-"(which must be a primitive type, i.e. one of \"bd"
-#ifdef WITH_DBUS_FLOAT32
-"f"
-#endif
-"ginoqstuxy\")\n"
+"(which must be a primitive type, i.e. one of \"bdginoqstuxy\")\n"
"and the 'value' type. The signature of the whole Dictionary will be\n"
"``a{xx}`` where ``xx`` is replaced by the given signature.\n"
"\n"
diff --git a/_dbus_bindings/int.c b/_dbus_bindings/int.c
index ba00f82..cb27a9f 100644
--- a/_dbus_bindings/int.c
+++ b/_dbus_bindings/int.c
@@ -505,13 +505,6 @@ PyDoc_STRVAR(Int64_tp_doc,
"\n"
"This type only works on platforms where the C compiler has suitable\n"
"64-bit types, such as C99 ``long long``.\n"
-#ifdef DBUS_PYTHON_64_BIT_WORKS
- "This is the case on your current platform.\n"
-#else /* !defined(DBUS_PYTHON_64_BIT_WORKS) */
- "This is not the case on your current platform, so this type's\n"
- "constructor will always raise NotImplementedError. Try a better\n"
- "compiler, if one is available.\n"
-#endif /* !defined(DBUS_PYTHON_64_BIT_WORKS) */
"\n"
"Constructor::\n"
"\n"
@@ -620,13 +613,6 @@ PyDoc_STRVAR(UInt64_tp_doc,
"\n"
"This type only exists on platforms where the C compiler has suitable\n"
"64-bit types, such as C99 ``unsigned long long``.\n"
-#ifdef DBUS_PYTHON_64_BIT_WORKS
- "This is the case on your current platform.\n"
-#else /* !defined(DBUS_PYTHON_64_BIT_WORKS) */
- "This is not the case on your current platform, so this type's\n"
- "constructor will always raise NotImplementedError. Try a better\n"
- "compiler, if one is available.\n"
-#endif /* !defined(DBUS_PYTHON_64_BIT_WORKS) */
"\n"
"Constructor::\n"
"\n"