modules: include Python.h from one place only, clean up includes

systemd headers should be included using <>.
And use a single include of Python.h and define PY_SSIZE_T_CLEAN
before it, so that we're using a consistent API everywhere.

Author: keszybz

meson.build

@@ -16,6 +16,7 @@ python_dep = python.dependency()
 libsystemd_dep = dependency('libsystemd')
 
 add_project_arguments(
+        '-D_GNU_SOURCE=1',
         '-DPACKAGE_VERSION="@0@"'.format(meson.project_version()),
         '-DLIBSYSTEMD_VERSION=@0@'.format(libsystemd_dep.version()),
         language : 'c',

src/systemd/_journal.c

@@ -1,13 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <Python.h>
-
 #include <alloca.h>
 
 #define SD_JOURNAL_SUPPRESS_LOCATION
 #include "systemd/sd-journal.h"
 
 #include "macro.h"
+#include "pyutil.h"
 
 PyDoc_STRVAR(journal_sendv__doc__,
              "sendv('FIELD=value', 'FIELD=value', ...) -> None\n\n"

src/systemd/_reader.c

@@ -1,23 +1,18 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#define PY_SSIZE_T_CLEAN
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wredundant-decls"
-#include <Python.h>
-#pragma GCC diagnostic pop
-
-#include <structmember.h>
-#include <datetime.h>
-#include <time.h>
-#include <stdio.h>
 #include <stdbool.h>
-
-#include "systemd/sd-journal.h"
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+#include <systemd/sd-journal.h>
 
 #include "pyutil.h"
 #include "macro.h"
 #include "strv.h"
 
+/* This needs to be below Python.h include for some reason */
+#include <datetime.h>
+
 #if defined(LIBSYSTEMD_VERSION) || LIBSYSTEMD_JOURNAL_VERSION > 204
 #  define HAVE_JOURNAL_OPEN_FILES 1
 #else

src/systemd/id128.c

@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <Python.h>
-
 /* Our include is first, so that our defines are replaced by the ones
  * from the system header. If the system header has the same definitions
  * (or does not have them at all), this replacement is silent. If the
@@ -12,8 +10,8 @@
 #include "id128-defines.h"
 #include <systemd/sd-messages.h>
 
-#include "pyutil.h"
 #include "macro.h"
+#include "pyutil.h"
 
 #define HAVE_SD_ID128_GET_MACHINE_APP_SPECIFIC (LIBSYSTEMD_VERSION >= 240)
 

src/systemd/login.c

@@ -1,12 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#define PY_SSIZE_T_CLEAN
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wredundant-decls"
-#include <Python.h>
-#pragma GCC diagnostic pop
+#include <systemd/sd-login.h>
 
-#include "systemd/sd-login.h"
 #include "pyutil.h"
 #include "strv.h"
 

src/systemd/macro.h

@@ -2,6 +2,8 @@
 
 #pragma once
 
+#include <stdlib.h>
+
 #define DISABLE_WARNING_MISSING_PROTOTYPES                              \
         _Pragma("GCC diagnostic push");                                 \
         _Pragma("GCC diagnostic ignored \"-Wmissing-prototypes\"")

src/systemd/pyutil.c

@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <Python.h>
 #include "pyutil.h"
 
 void cleanup_Py_DECREFp(PyObject **p) {

src/systemd/pyutil.h

@@ -2,10 +2,8 @@
 
 #pragma once
 
-#ifndef Py_TYPE
-/* avoid duplication warnings from errors in Python 2.7 headers */
-# include <Python.h>
-#endif
+#define PY_SSIZE_T_CLEAN
+#include <Python.h>
 
 void cleanup_Py_DECREFp(PyObject **p);
 PyObject* absolute_timeout(uint64_t t);