python/python-fix_date_time_compiler.patch

81 lines
1.8 KiB
Diff

Index: Modules/getbuildinfo.c
===================================================================
--- Modules/getbuildinfo.c.orig 2010-05-09 16:46:46.000000000 +0200
+++ Modules/getbuildinfo.c 2011-02-17 17:25:00.904694976 +0100
@@ -4,19 +4,19 @@
#include <stdio.h>
#endif
-#ifndef DATE
-#ifdef __DATE__
-#define DATE __DATE__
+#ifndef PY_BUILD_DATE
+#ifdef __PY_BUILD_DATE__
+#define PY_BUILD_DATE __PY_BUILD_DATE__
#else
-#define DATE "xx/xx/xx"
+#define PY_BUILD_DATE "xx/xx/xx"
#endif
#endif
-#ifndef TIME
-#ifdef __TIME__
-#define TIME __TIME__
+#ifndef PY_BUILD_TIME
+#ifdef __PY_BUILD_TIME__
+#define PY_BUILD_TIME __PY_BUILD_TIME__
#else
-#define TIME "xx:xx:xx"
+#define PY_BUILD_TIME "xx:xx:xx"
#endif
#endif
@@ -37,7 +37,7 @@ Py_GetBuildInfo(void)
const char *branch = Py_SubversionShortBranch();
PyOS_snprintf(buildinfo, sizeof(buildinfo),
"%s%s%s, %.20s, %.9s", branch, sep, revision,
- DATE, TIME);
+ PY_BUILD_DATE, PY_BUILD_TIME);
return buildinfo;
}
Index: Python/getcompiler.c
===================================================================
--- Python/getcompiler.c.orig 2000-09-05 06:40:39.000000000 +0200
+++ Python/getcompiler.c 2011-02-17 17:23:55.320858100 +0100
@@ -3,26 +3,26 @@
#include "Python.h"
-#ifndef COMPILER
+#ifndef PYTHON_COMPILER
#ifdef __GNUC__
-#define COMPILER "\n[GCC " __VERSION__ "]"
+#define PYTHON_COMPILER "\n[GCC " __VERSION__ "]"
#endif
-#endif /* !COMPILER */
+#endif /* !PYTHON_COMPILER */
-#ifndef COMPILER
+#ifndef PYTHON_COMPILER
#ifdef __cplusplus
-#define COMPILER "[C++]"
+#define PYTHON_COMPILER "[C++]"
#else
-#define COMPILER "[C]"
+#define PYTHON_COMPILER "[C]"
#endif
-#endif /* !COMPILER */
+#endif /* !PYTHON_COMPILER */
const char *
Py_GetCompiler(void)
{
- return COMPILER;
+ return PYTHON_COMPILER;
}