journal: use missing_audit.h to generate audit_type-list.txt

diff --git a/src/basic/meson.build b/src/basic/meson.build
index 417daee06eb4e231abadcd9d2c2779b60b8bc9f9..67acdd2bf9a7125ff36de0a53477aa9f4bd46283 100644 (file)
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -91,6 +91,7 @@ basic_sources = files('''
         memfd-util.h
         mempool.c
         mempool.h
+        missing.h
         missing_audit.h
         missing_btrfs.h
         missing_btrfs_tree.h
@@ -209,7 +210,7 @@ basic_sources = files('''
         xattr-util.h
 '''.split())
 
-missing_h = files('missing.h')
+missing_audit_h = files('missing_audit.h')
 missing_capability_h = files('missing_capability.h')
 
 generate_af_list = find_program('generate-af-list.sh')
@@ -279,7 +280,7 @@ foreach item : [['af',     af_list_txt,     'af',         ''],
         generated_gperf_headers += [target1, target2]
 endforeach
 
-basic_sources += [missing_h] + generated_gperf_headers
+basic_sources += generated_gperf_headers
 basic_gcrypt_sources = files(
         'gcrypt-util.c',
         'gcrypt-util.h')

diff --git a/src/journal/audit-type.c b/src/journal/audit-type.c
index b30963da667b397467d9f9b58488645f66e5f05f..7b3dc1e9ab0eed9ddf0512c6132a096497f8b01a 100644 (file)
--- a/src/journal/audit-type.c
+++ b/src/journal/audit-type.c
@@ -1,12 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <stdio.h>
-#include <linux/audit.h>
-#if HAVE_AUDIT
-#  include <libaudit.h>
-#endif
-
-#include "missing.h"
 #include "audit-type.h"
+#include "missing_audit.h"
+
 #include "audit_type-to-name.h"
-#include "macro.h"

diff --git a/src/journal/audit-type.h b/src/journal/audit-type.h
index 965b044cbf0d3221bdc521c497a17e6cb7460f43..069a883490d69b0b071d3327996bd2caa1a82db9 100644 (file)
--- a/src/journal/audit-type.h
+++ b/src/journal/audit-type.h
@@ -1,6 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
+#include <alloca.h>
+#include <stdio.h>
+
 #include "macro.h"
 
 const char *audit_type_to_string(int type);

diff --git a/src/journal/meson.build b/src/journal/meson.build
index 807dece545c96dffcab9186674741d39be40aea4..e03d6dc232713a35da9e60216e46d9514149f417 100644 (file)
--- a/src/journal/meson.build
+++ b/src/journal/meson.build
@@ -34,7 +34,7 @@ endif
 ############################################################
 
 audit_type_includes = [config_h,
-                       missing_h,
+                       missing_audit_h,
                        'linux/audit.h']
 if conf.get('HAVE_AUDIT') == 1
         audit_type_includes += 'libaudit.h'