aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/python/python-internal.h10
2 files changed, 13 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ad3e894..4bfe017 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
2010-10-26 Joel Brobecker <brobecker@adacore.com>
+ * python/python-internal.h (_FILE_OFFSET_BITS): Undefine.
+ (PyEval_InitThreads): Remove duplicate. Define as nothing.
+ (PyEval_ReleaseLock): Define as nothing.
+
+2010-10-26 Joel Brobecker <brobecker@adacore.com>
+
* dwarf2read.c (psymtab_include_file_name): Replace call to strcmp
by call to FILENAME_CMP.
diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h
index d00c23e..e18f50a 100644
--- a/gdb/python/python-internal.h
+++ b/gdb/python/python-internal.h
@@ -36,6 +36,11 @@
#undef _POSIX_C_SOURCE
#undef _XOPEN_SOURCE
+/* On sparc-solaris, /usr/include/sys/feature_tests.h defines
+ _FILE_OFFSET_BITS, which pyconfig.h also defines. Same work
+ arount technique as above. */
+#undef _FILE_OFFSET_BITS
+
#if HAVE_LIBPYTHON2_4
#include "python2.4/Python.h"
#include "python2.4/frameobject.h"
@@ -63,10 +68,9 @@ typedef int Py_ssize_t;
#ifndef WITH_THREAD
#define PyGILState_Ensure() ((PyGILState_STATE) 0)
#define PyGILState_Release(ARG) ((void)(ARG))
-#define PyEval_InitThreads() 0
+#define PyEval_InitThreads()
#define PyThreadState_Swap(ARG) ((void)(ARG))
-#define PyEval_InitThreads() 0
-#define PyEval_ReleaseLock() 0
+#define PyEval_ReleaseLock()
#endif
/* In order to be able to parse symtab_and_line_to_sal_object function