SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

python: Set VERSION using existing VERSION_MAJOR and VERSION_MINOR macros and some mintor refactoring.

This commit is contained in:
Arnavion 2013-07-30 22:54:57 -07:00
parent 154ea98deb
commit 4a95b07ae7
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
plugins/python/python.c
View File

@ -72,15 +72,32 @@
#include <structmember.h> #include <structmember.h>
#include <pythread.h> #include <pythread.h>
/* Macros to convert version macros into string literals.
* The indirect macro is a well-known preprocessor trick to force X to be evaluated before the # operator acts to make it a string literal.
* If STRINGIZE were to be directly defined as #X instead, VERSION would be "VERSION_MAJOR" instead of "1".
*/
#define STRINGIZE2(X) #X
#define STRINGIZE(X) STRINGIZE2(X)
/* Version number macros */
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#if PY_MAJOR_VERSION == 2 /* Version string macro */
#ifdef WIN32 #ifdef WIN32
#undef WITH_THREAD #if PY_MAJOR_VERSION == 2
#define VERSION "1.0/2.7" /* Linked to python27.dll */ #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 #endif
#ifndef VERSION
#define VERSION STRINGIZE(VERSION_MAJOR) "." STRINGIZE(VERSION_MINOR)
#endif
/* #define's for Python 2 */
#if PY_MAJOR_VERSION == 2
#undef PyLong_Check #undef PyLong_Check
#define PyLong_Check PyInt_Check #define PyLong_Check PyInt_Check
#define PyLong_AsLong PyInt_AsLong #define PyLong_AsLong PyInt_AsLong
@ -95,15 +112,14 @@
#define PyUnicode_FromString PyString_FromString #define PyUnicode_FromString PyString_FromString
#define PyUnicode_AsUTF8 PyString_AsString #define PyUnicode_AsUTF8 PyString_AsString
#else
#define IS_PY3K
#ifdef WIN32 #ifdef WIN32
#define VERSION "1.0/3.3" /* Linked to python33.dll */ #undef WITH_THREAD
#endif #endif
#endif #endif
#ifndef VERSION /* #define for Python 3 */
#define VERSION "1.0" #if PY_MAJOR_VERSION == 3
#define IS_PY3K
#endif #endif
#define NONE 0 #define NONE 0