Adding upstream version 14.2.21.upstream/14.2.21upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 38 insertions, 0 deletions

diff --git a/src/mgr/PythonCompat.h b/src/mgr/PythonCompat.h
new file mode 100644
index 00000000..4ffb2eee
--- /dev/null
+++ b/src/mgr/PythonCompat.h
@@ -0,0 +1,38 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
+#pragma once
+
+#include <Python.h>
+
+// Python's pyconfig-64.h conflicts with ceph's acconfig.h
+#undef HAVE_SYS_WAIT_H
+#undef HAVE_UNISTD_H
+#undef HAVE_UTIME_H
+#undef _POSIX_C_SOURCE
+#undef _XOPEN_SOURCE
+
+#if PY_MAJOR_VERSION >= 3
+inline PyObject* PyString_FromString(const char *v) {
+  return PyUnicode_FromFormat("%s", v);
+}
+inline const char* PyString_AsString(PyObject *string) {
+  return PyUnicode_AsUTF8(string);
+}
+inline long PyInt_AsLong(PyObject *io) {
+  return PyLong_AsLong(io);
+}
+inline PyObject* PyInt_FromLong(long ival) {
+  return PyLong_FromLong(ival);
+}
+inline int PyString_Check(PyObject *o) {
+  return PyUnicode_Check(o);
+}
+inline PyObject* PyFloat_FromString(PyObject *s, void *arg) {
+  return PyFloat_FromString(s);
+}
+inline PyObject* PyInt_FromString(const char *str, char **pend, int base) {
+  return PyLong_FromString(str, pend, base);
+}
+#define PyString_Type PyUnicode_Type
+#endif