fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 18:18:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: rename "libnm-core/nm-jansson.h" to "libnm-core/nm-json.h"

Browse source 
We already have "shared/nm-utils/nm-jansson.h". Avoid reusing the same file name.
This commit is contained in:
Thomas Haller 2018-01-09 06:20:18 +01:00
parent 950a14128b
commit b6b6baa773
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile.am
View file

@ -522,9 +522,9 @@ libnm_core_lib_c_real = \
if WITH_JSON_VALIDATION if WITH_JSON_VALIDATION
libnm_core_lib_h_priv += \ libnm_core_lib_h_priv += \
libnm-core/nm-jansson.h libnm-core/nm-json.h
libnm_core_lib_c_real += \ libnm_core_lib_c_real += \
libnm-core/nm-jansson.c libnm-core/nm-json.c
endif endif
libnm_core_lib_c_mkenums = \ libnm_core_lib_c_mkenums = \

2
libnm-core/meson.build
View file

@ -146,7 +146,7 @@ cflags = [
] ]
if enable_json_validation if enable_json_validation
libnm_core_sources += files('nm-jansson.c') libnm_core_sources += files('nm-json.c')
deps += jansson_dep deps += jansson_dep
endif endif

2
libnm-core/nm-jansson.c → libnm-core/nm-json.c
View file

@ -22,7 +22,7 @@
#include "nm-default.h" #include "nm-default.h"
#define NM_JAONSSON_C #define NM_JAONSSON_C
#include "nm-jansson.h" #include "nm-json.h"
void *_nm_jansson_json_object_iter_value; void *_nm_jansson_json_object_iter_value;
void *_nm_jansson_json_object_key_to_iter; void *_nm_jansson_json_object_key_to_iter;

0
libnm-core/nm-jansson.h → libnm-core/nm-json.h
View file

2
libnm-core/nm-utils.c
View file

@ -36,7 +36,7 @@
#include <linux/pkt_sched.h> #include <linux/pkt_sched.h>
#if WITH_JSON_VALIDATION #if WITH_JSON_VALIDATION
#include "nm-jansson.h" #include "nm-json.h"
#endif #endif
#include "nm-utils/nm-jansson.h" #include "nm-utils/nm-jansson.h"