fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 13:00:16 +01: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.

(cherry picked from commit b6b6baa773)
This commit is contained in:
Thomas Haller 2018-01-09 06:20:18 +01:00 • committed by Lubomir Rintel
parent 75dfbfcef4
commit bbcb9ebefc
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile.am
View file

@ -521,9 +521,9 @@ libnm_core_lib_c_real = \
if WITH_JANSSON
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 = \

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

@ -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;

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>
#if WITH_JANSSON
#include "nm-jansson.h"
#include "nm-json.h"
#include <jansson.h>
#endif