iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make Python version consistent on both platforms

Browse Source 
and don't hardcode 2.7/3.3
This commit is contained in:
TingPing 2013-09-25 20:53:23 -04:00
parent c7a00a4aba
commit d18a95fda6
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/python/python.c
View File

@ -83,18 +83,9 @@
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 0 #define VERSION_MINOR 0
/* Version string macro */ /* Version string macro e.g 1.0/3.3 */
#ifdef WIN32 #define VERSION STRINGIZE(VERSION_MAJOR) "." STRINGIZE(VERSION_MINOR) "/" \
#if PY_MAJOR_VERSION == 2 STRINGIZE(PY_MAJOR_VERSION) "." STRINGIZE (PY_MINOR_VERSION)
#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
/* #define's for Python 2 */ /* #define's for Python 2 */
#if PY_MAJOR_VERSION == 2 #if PY_MAJOR_VERSION == 2
@ -382,7 +373,7 @@ Usage: /PY LOAD <filename>\n\
ABOUT\n\ ABOUT\n\
\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 */ /* Utility functions */