Deal with warning: 'PyUnicode_FromStringAndSize' macro redefined

Author: ifduyue

src/_xxhash.c

@@ -48,8 +48,10 @@
 
 /* Use byte string on PY2 */
 #if PY_MAJOR_VERSION < 3
-#define PyUnicode_FromStringAndSize PyString_FromStringAndSize
+#define MyPyUnicode_FromStringAndSize PyString_FromStringAndSize
 #define PyBytes_FromStringAndSize   PyString_FromStringAndSize
+#else
+#define MyPyUnicode_FromStringAndSize PyUnicode_FromStringAndSize
 #endif
 
 /*****************************************************************************
@@ -127,7 +129,7 @@ static PyObject *xxh32_hexdigest(PyObject *self, PyObject *args, PyObject *kwarg
         retbuf[j++] = c;
     }
 
-    return PyUnicode_FromStringAndSize(retbuf, sizeof(retbuf));
+    return MyPyUnicode_FromStringAndSize(retbuf, sizeof(retbuf));
 }
 
 /* XXH64 */
@@ -204,7 +206,7 @@ static PyObject *xxh64_hexdigest(PyObject *self, PyObject *args, PyObject *kwarg
         retbuf[j++] = c;
     }
 
-    return PyUnicode_FromStringAndSize(retbuf, sizeof(retbuf));
+    return MyPyUnicode_FromStringAndSize(retbuf, sizeof(retbuf));
 }
 
 /* XXH3_64 */
@@ -282,7 +284,7 @@ static PyObject *xxh3_64_hexdigest(PyObject *self, PyObject *args, PyObject *kwa
         retbuf[j++] = c;
     }
 
-    return PyUnicode_FromStringAndSize(retbuf, sizeof(retbuf));
+    return MyPyUnicode_FromStringAndSize(retbuf, sizeof(retbuf));
 }
 
 /* XXH3_128 */
@@ -372,7 +374,7 @@ static PyObject *xxh3_128_hexdigest(PyObject *self, PyObject *args, PyObject *kw
         retbuf[j++] = c;
     }
 
-    return PyUnicode_FromStringAndSize(retbuf, sizeof(retbuf));
+    return MyPyUnicode_FromStringAndSize(retbuf, sizeof(retbuf));
 }
 
 /*****************************************************************************
@@ -513,7 +515,7 @@ static PyObject *PYXXH32_hexdigest(PYXXH32Object *self)
         retbuf[j++] = c;
     }
 
-    return PyUnicode_FromStringAndSize(retbuf, sizeof(retbuf));
+    return MyPyUnicode_FromStringAndSize(retbuf, sizeof(retbuf));
 }
 
 PyDoc_STRVAR(
@@ -586,7 +588,7 @@ PYXXH32_get_digest_size(PYXXH32Object *self, void *closure)
 static PyObject *
 PYXXH32_get_name(PYXXH32Object *self, void *closure)
 {
-    return PyUnicode_FromStringAndSize("XXH32", sizeof("XXH32"));
+    return MyPyUnicode_FromStringAndSize("XXH32", sizeof("XXH32"));
 }
 
 static PyObject *
@@ -820,7 +822,7 @@ static PyObject *PYXXH64_hexdigest(PYXXH64Object *self)
         retbuf[j++] = c;
     }
 
-    return PyUnicode_FromStringAndSize(retbuf, sizeof(retbuf));
+    return MyPyUnicode_FromStringAndSize(retbuf, sizeof(retbuf));
 }
 
 
@@ -894,7 +896,7 @@ PYXXH64_get_digest_size(PYXXH64Object *self, void *closure)
 static PyObject *
 PYXXH64_get_name(PYXXH64Object *self, void *closure)
 {
-    return PyUnicode_FromStringAndSize("XXH64", sizeof("XXH64"));
+    return MyPyUnicode_FromStringAndSize("XXH64", sizeof("XXH64"));
 }
 
 static PyObject *
@@ -1129,7 +1131,7 @@ static PyObject *PYXXH3_64_hexdigest(PYXXH3_64Object *self)
         retbuf[j++] = c;
     }
 
-    return PyUnicode_FromStringAndSize(retbuf, sizeof(retbuf));
+    return MyPyUnicode_FromStringAndSize(retbuf, sizeof(retbuf));
 }
 
 
@@ -1210,7 +1212,7 @@ PYXXH3_64_get_digest_size(PYXXH3_64Object *self, void *closure)
 static PyObject *
 PYXXH3_64_get_name(PYXXH3_64Object *self, void *closure)
 {
-    return PyUnicode_FromStringAndSize("XXH3_64", sizeof("XXH3_64"));
+    return MyPyUnicode_FromStringAndSize("XXH3_64", sizeof("XXH3_64"));
 }
 
 static PyObject *
@@ -1446,7 +1448,7 @@ static PyObject *PYXXH3_128_hexdigest(PYXXH3_128Object *self)
         retbuf[j++] = c;
     }
 
-    return PyUnicode_FromStringAndSize(retbuf, sizeof(retbuf));
+    return MyPyUnicode_FromStringAndSize(retbuf, sizeof(retbuf));
 }
 
 
@@ -1542,7 +1544,7 @@ PYXXH3_128_get_digest_size(PYXXH3_128Object *self, void *closure)
 static PyObject *
 PYXXH3_128_get_name(PYXXH3_128Object *self, void *closure)
 {
-    return PyUnicode_FromStringAndSize("XXH3_128", sizeof("XXH3_128"));
+    return MyPyUnicode_FromStringAndSize("XXH3_128", sizeof("XXH3_128"));
 }
 
 static PyObject *