[PATCH v2] perf: Fix undefined PyVarObject_HEAD_INIT in python 2.5

From: Frederic Weisbecker
Date: Sat Feb 26 2011 - 10:11:45 EST


PyVarObject_HEAD_INIT is undefined in python 2.5, resulting
in a build crash:

util/python.c:81: attention : dÃclaration implicite de la fonction  ÂPyVarObject_HEAD_INIT Â
util/python.c:82: erreur: request for member Âtp_name in something not a structure or union
util/python.c:117: erreur: request for member Âtp_name in something not a structure or union
util/python.c:146: erreur: request for member Âtp_name in something not a structure or union
util/python.c:177: erreur: request for member Âtp_name in something not a structure or union
util/python.c:290: erreur: request for member Âtp_name in something not a structure or union
util/python.c:359: erreur: request for member Âtp_name in something not a structure or union
util/python.c:532: erreur: request for member Âtp_name in something not a structure or union
util/python.c:761: erreur: request for member Âtp_name in something not a structure or union
error: command 'gcc' failed with exit status 1
make: *** [python/perf.so] Erreur 1

We can fix that by defining PyVarObject_HEAD_INIT as a wrapper on
PyObject_HEAD_INIT, thanks to a trick found on biopython:
https://github.com/biopython/biopython/commit/d4eaf57946c7b4c32eca8d18821edf32f83e300d

Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/util/python.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
index 5317ef2..a9f2d7e 100644
--- a/tools/perf/util/python.c
+++ b/tools/perf/util/python.c
@@ -8,6 +8,11 @@
#include "cpumap.h"
#include "thread_map.h"

+/* Define PyVarObject_HEAD_INIT for python 2.5 */
+#ifndef PyVarObject_HEAD_INIT
+# define PyVarObject_HEAD_INIT(type, size) PyObject_HEAD_INIT(type) size,
+#endif
+
struct throttle_event {
struct perf_event_header header;
u64 time;
--
1.7.3.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/