diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8d2980b442b440902812675698706467f74dbd8c..e917700f7a754e394cc27b5ac123da42c72d42dd 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-22  Tom Tromey  <tromey@redhat.com>
+
+	* python/python-value.c (valpy_length): Remove #if.
+
 2008-12-22  Paul Pluzhnikov  <ppluzhnikov@google.com>
 
 	* python/python-internal.h (PyEval_ReleaseLock): New define.
diff --git a/gdb/python/python-value.c b/gdb/python/python-value.c
index b23174ca2b793f3c7adafdcfdf5c2303e6e2b9a3..9db7208404798fd8f69a51cca3a5e8f0af8c6197 100644
--- a/gdb/python/python-value.c
+++ b/gdb/python/python-value.c
@@ -132,11 +132,7 @@ valpy_dereference (PyObject *self, PyObject *args)
   return value_to_value_object (res_val);
 }
 
-#ifdef HAVE_LIBPYTHON2_4
-static int
-#else
 static Py_ssize_t
-#endif
 valpy_length (PyObject *self)
 {
   /* We don't support getting the number of elements in a struct / class.  */