summary refs log tree commit diff stats
path: root/plugins
diff options
context:
space:
mode:
authorTingPing <tingping@tingping.se>2013-09-25 20:53:23 -0400
committerTingPing <tingping@tingping.se>2013-09-25 20:53:23 -0400
commitd18a95fda6449fc9bc3c64b7b7f0582d2b767957 (patch)
treec462319087357f0a5bc46651ffb7e639ae772f1c /plugins
parentc7a00a4aba32984b4d3cc8fc5bb1039f4f6cc224 (diff)
Make Python version consistent on both platforms
and don't hardcode 2.7/3.3
Diffstat (limited to 'plugins')
-rw-r--r--plugins/python/python.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/plugins/python/python.c b/plugins/python/python.c
index 7bedcad9..9ef7e0ed 100644
--- a/plugins/python/python.c
+++ b/plugins/python/python.c
@@ -83,18 +83,9 @@
 #define VERSION_MAJOR 1
 #define VERSION_MINOR 0
 
-/* Version string macro */
-#ifdef WIN32
-#if PY_MAJOR_VERSION == 2
-#define VERSION STRINGIZE(VERSION_MAJOR) "." STRINGIZE(VERSION_MINOR) "/2.7"	/* Linked to python27.dll */
-#elif PY_MAJOR_VERSION == 3
-#define VERSION STRINGIZE(VERSION_MAJOR) "." STRINGIZE(VERSION_MINOR) "/3.3"	/* Linked to python33.dll */
-#endif
-#endif
-
-#ifndef VERSION
-#define VERSION STRINGIZE(VERSION_MAJOR) "." STRINGIZE(VERSION_MINOR)
-#endif
+/* Version string macro e.g 1.0/3.3 */
+#define VERSION STRINGIZE(VERSION_MAJOR) "." STRINGIZE(VERSION_MINOR) "/" \
+				STRINGIZE(PY_MAJOR_VERSION) "." STRINGIZE (PY_MINOR_VERSION)
 
 /* #define's for Python 2 */
 #if PY_MAJOR_VERSION == 2
@@ -382,7 +373,7 @@ Usage: /PY LOAD   <filename>\n\
            ABOUT\n\
 \n";
 
-static const char about[] = "HexChat Python " PY_VERSION " Interface Version " VERSION "\n";
+static const char about[] = "HexChat Python interface version " VERSION "\n";
 
 /* ===================================================================== */
 /* Utility functions */