mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-22 10:46:59 +00:00
libnm: rename "libnm-core/nm-jansson.h" to "libnm-core/nm-json.h"
We already have "shared/nm-utils/nm-jansson.h". Avoid reusing the same file name.
This commit is contained in:
parent
950a14128b
commit
b6b6baa773
|
@ -522,9 +522,9 @@ libnm_core_lib_c_real = \
|
|||
|
||||
if WITH_JSON_VALIDATION
|
||||
libnm_core_lib_h_priv += \
|
||||
libnm-core/nm-jansson.h
|
||||
libnm-core/nm-json.h
|
||||
libnm_core_lib_c_real += \
|
||||
libnm-core/nm-jansson.c
|
||||
libnm-core/nm-json.c
|
||||
endif
|
||||
|
||||
libnm_core_lib_c_mkenums = \
|
||||
|
|
|
@ -146,7 +146,7 @@ cflags = [
|
|||
]
|
||||
|
||||
if enable_json_validation
|
||||
libnm_core_sources += files('nm-jansson.c')
|
||||
libnm_core_sources += files('nm-json.c')
|
||||
deps += jansson_dep
|
||||
endif
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
#include "nm-default.h"
|
||||
|
||||
#define NM_JAONSSON_C
|
||||
#include "nm-jansson.h"
|
||||
#include "nm-json.h"
|
||||
|
||||
void *_nm_jansson_json_object_iter_value;
|
||||
void *_nm_jansson_json_object_key_to_iter;
|
|
@ -36,7 +36,7 @@
|
|||
#include <linux/pkt_sched.h>
|
||||
|
||||
#if WITH_JSON_VALIDATION
|
||||
#include "nm-jansson.h"
|
||||
#include "nm-json.h"
|
||||
#endif
|
||||
|
||||
#include "nm-utils/nm-jansson.h"
|
||||
|
|
Loading…
Reference in a new issue