From: Gregory P. Smith <greg@mad-scientist.com>
Date: Mon, 26 May 2008 19:03:35 +0000 (+0000)
Subject: Define macros so that this still compiles on Python prior to r63675.
X-Git-Tag: v2.6b1~233
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=572226cad83ce164d6885cc051a79dd57a1dc862;p=python

Define macros so that this still compiles on Python prior to r63675.
---

diff --git a/Modules/_bsddb.c b/Modules/_bsddb.c
index 86b9839b39..812f233210 100644
--- a/Modules/_bsddb.c
+++ b/Modules/_bsddb.c
@@ -104,6 +104,17 @@ static char *rcs_id = "$Id$";
 typedef int Py_ssize_t;
 #endif
 
+#if (PY_VERSION_HEX < 0x02060000)  /* really: before python trunk r63675 */
+/* This code now uses PyBytes* API function names instead of PyString*.
+ * These #defines map to their equivalent on earlier python versions.    */
+#define PyBytes_FromStringAndSize PyString_FromStringAndSize
+#define PyBytes_FromString PyString_FromString
+#define PyBytes_AsStringAndSize PyString_AsStringAndSize
+#define PyBytes_Check PyString_Check
+#define PyBytes_GET_SIZE PyString_GET_SIZE
+#define PyBytes_AS_STRING PyString_AS_STRING
+#endif
+
 #ifdef WITH_THREAD
 
 /* These are for when calling Python --> C */