diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-12-07 11:48:37 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-12-07 11:48:37 +0900 |
| commit | 18bf324ab53665f803ea5580ef9be6d99b7e78ca (patch) | |
| tree | d508602c991b08ddf8b4ab3f6bff070b250cfe43 | |
| parent | 54480d649ff0b2948983c1fff3e26cc3ddfca534 (diff) | |
| download | systemd-18bf324ab53665f803ea5580ef9be6d99b7e78ca.tar.gz | |
journal: use missing_audit.h to generate audit_type-list.txt
| -rw-r--r-- | src/basic/meson.build | 5 | ||||
| -rw-r--r-- | src/journal/audit-type.c | 10 | ||||
| -rw-r--r-- | src/journal/audit-type.h | 3 | ||||
| -rw-r--r-- | src/journal/meson.build | 2 |
4 files changed, 9 insertions, 11 deletions
diff --git a/src/basic/meson.build b/src/basic/meson.build index 417daee06e..67acdd2bf9 100644 --- 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 b30963da66..7b3dc1e9ab 100644 --- 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 965b044cbf..069a883490 100644 --- 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 807dece545..e03d6dc232 100644 --- 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' |