2009-05-28 Pierre Muller <muller@ics.u-strasbg.fr>

Paul Pluzhnikov  <ppluzhnikov@google.com>

	* configure.ac (!have_libpython): Add python-prettyprint source
	and object files.
	* configure: Regenerate.
	* python/python-prettyprint.c: Move "#ifdef HAVE_PYTHON" before
	python headers.
This commit is contained in:
Paul Pluzhnikov 2009-05-28 16:30:39 +00:00
parent b662cd9e98
commit 6bf0ce2bed
4 changed files with 18 additions and 8 deletions

View File

@ -1,3 +1,12 @@
2009-05-28 Pierre Muller <muller@ics.u-strasbg.fr>
Paul Pluzhnikov <ppluzhnikov@google.com>
* configure.ac (!have_libpython): Add python-prettyprint source
and object files.
* configure: Regenerate.
* python/python-prettyprint.c: Move "#ifdef HAVE_PYTHON" before
python headers.
2009-05-27 Vladimir Prus <vladimir@codesourcery.com>
Tom Tromey <tromey@redhat.com>
Thiago Jung Bauermann <bauerman@br.ibm.com>

4
gdb/configure vendored
View File

@ -11907,8 +11907,8 @@ echo "${ECHO_T}${PYTHON_CFLAGS}" >&6
else
# Even if Python support is not compiled in, we need to have these files
# included in order to recognize the GDB command "python".
CONFIG_OBS="$CONFIG_OBS python.o python-value.o"
CONFIG_SRCS="$CONFIG_SRCS python/python.c python/python-value.c"
CONFIG_OBS="$CONFIG_OBS python.o python-value.o python-prettyprint.o"
CONFIG_SRCS="$CONFIG_SRCS python/python.c python/python-value.c python/python-prettyprint.c"
fi

View File

@ -685,8 +685,8 @@ if test "${have_libpython}" = yes; then
else
# Even if Python support is not compiled in, we need to have these files
# included in order to recognize the GDB command "python".
CONFIG_OBS="$CONFIG_OBS python.o python-value.o"
CONFIG_SRCS="$CONFIG_SRCS python/python.c python/python-value.c"
CONFIG_OBS="$CONFIG_OBS python.o python-value.o python-prettyprint.o"
CONFIG_SRCS="$CONFIG_SRCS python/python.c python/python-value.c python/python-prettyprint.c"
fi
AC_SUBST(PYTHON_CFLAGS)

View File

@ -23,10 +23,12 @@
#include "symtab.h"
#include "language.h"
#include "valprint.h"
#include "python.h"
#include "python-internal.h"
#ifdef HAVE_PYTHON
#include "python-internal.h"
/* Helper function for find_pretty_printer which iterates over a list,
calls each function and inspects output. This will return a
@ -587,9 +589,8 @@ gdbpy_default_visualizer (PyObject *self, PyObject *args)
int
apply_val_pretty_printer (struct type *type, const gdb_byte *valaddr,
int embedded_offset, CORE_ADDR address,
struct ui_file *stream, int format,
int deref_ref, int recurse,
enum val_prettyprint pretty,
struct ui_file *stream, int recurse,
const struct value_print_options *options,
const struct language_defn *language)
{
return 0;