* varobj.c (varobj_add_child, install_dynamic_child): Wrap into #if
	HAVE_PYTHON.
	(instantiate_pretty_printer): Move HAVE_PYTHON outside of the function.
This commit is contained in:
Jan Kratochvil 2010-01-20 06:36:38 +00:00
parent 2b1a61a6cf
commit d8b65138e1
2 changed files with 20 additions and 4 deletions

View File

@ -1,3 +1,9 @@
2010-01-20 Jan Kratochvil <jan.kratochvil@redhat.com>
* varobj.c (varobj_add_child, install_dynamic_child): Wrap into #if
HAVE_PYTHON.
(instantiate_pretty_printer): Move HAVE_PYTHON outside of the function.
2010-01-20 Joel Brobecker <brobecker@adacore.com>
Get rid of ada-lang.c:function_name_from_pc.

View File

@ -293,9 +293,13 @@ static int varobj_value_is_changeable_p (struct varobj *var);
static int is_root_p (struct varobj *var);
#if HAVE_PYTHON
static struct varobj *
varobj_add_child (struct varobj *var, const char *name, struct value *value);
#endif /* HAVE_PYTHON */
/* C implementation */
static int c_number_of_children (struct varobj *var);
@ -759,12 +763,13 @@ varobj_delete (struct varobj *var, char ***dellist, int only_children)
return delcount;
}
#if HAVE_PYTHON
/* Convenience function for varobj_set_visualizer. Instantiate a
pretty-printer for a given value. */
static PyObject *
instantiate_pretty_printer (PyObject *constructor, struct value *value)
{
#if HAVE_PYTHON
PyObject *val_obj = NULL;
PyObject *printer;
@ -775,10 +780,11 @@ instantiate_pretty_printer (PyObject *constructor, struct value *value)
printer = PyObject_CallFunctionObjArgs (constructor, val_obj, NULL);
Py_DECREF (val_obj);
return printer;
#endif
return NULL;
}
#endif
/* Set/Get variable object display format */
enum varobj_display_formats
@ -899,6 +905,8 @@ restrict_range (VEC (varobj_p) *children, int *from, int *to)
}
}
#if HAVE_PYTHON
/* A helper for update_dynamic_varobj_children that installs a new
child when needed. */
@ -935,8 +943,6 @@ install_dynamic_child (struct varobj *var,
}
}
#if HAVE_PYTHON
static int
dynamic_varobj_has_child_method (struct varobj *var)
{
@ -1158,6 +1164,8 @@ varobj_list_children (struct varobj *var, int *from, int *to)
return var->children;
}
#if HAVE_PYTHON
static struct varobj *
varobj_add_child (struct varobj *var, const char *name, struct value *value)
{
@ -1168,6 +1176,8 @@ varobj_add_child (struct varobj *var, const char *name, struct value *value)
return v;
}
#endif /* HAVE_PYTHON */
/* Obtain the type of an object Variable as a string similar to the one gdb
prints on the console */