From: Georg Brandl <georg@python.org>
Date: Fri, 11 Jan 2008 09:19:11 +0000 (+0000)
Subject: Guard definition of TIPC_SUB_CANCEL with an #ifdef.
X-Git-Tag: v2.6a1~644
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff15c866a65981682923b62684a88c8053533385;p=thirdparty%2FPython%2Fcpython.git

Guard definition of TIPC_SUB_CANCEL with an #ifdef.
---

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 4e340a6b51a5..c060dcde7874 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -4591,7 +4591,10 @@ init_socket(void)
 	/* for subscriptions */
 	PyModule_AddIntConstant(m, "TIPC_SUB_PORTS", TIPC_SUB_PORTS);
 	PyModule_AddIntConstant(m, "TIPC_SUB_SERVICE", TIPC_SUB_SERVICE);
-     /* PyModule_AddIntConstant(m, "TIPC_SUB_CANCEL", TIPC_SUB_CANCEL); XXX This var is missing on gcc (GCC) 4.1.1 (Gentoo 4.1.1) and it breaks the build */
+#ifdef TIPC_SUB_CANCEL
+	/* doesn't seem to be available everywhere */
+	PyModule_AddIntConstant(m, "TIPC_SUB_CANCEL", TIPC_SUB_CANCEL);
+#endif
 	PyModule_AddIntConstant(m, "TIPC_WAIT_FOREVER", TIPC_WAIT_FOREVER);
 	PyModule_AddIntConstant(m, "TIPC_PUBLISHED", TIPC_PUBLISHED);
 	PyModule_AddIntConstant(m, "TIPC_WITHDRAWN", TIPC_WITHDRAWN);