fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-30 20:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: only include "nm-jansson.h" from "nm-json.h"

Browse source 
"nm-utils/nm-jansson.h" and thus <jansson.h> must be included only
after "nm-json.h". Enforce that by never including them directly,
except from "nm-json.h" itself.
This commit is contained in:
Thomas Haller 2018-01-09 07:20:19 +01:00
parent ee56c9250f
commit e5f3c0fc8a
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libnm-core/nm-json.h
View file

@ -44,6 +44,8 @@ gboolean nm_jansson_load (void);
#define json_object_iter (*_nm_jansson_json_object_iter)
#define json_integer_value (*_nm_jansson_json_integer_value)
#define json_string_value (*_nm_jansson_json_string_value)
#include "nm-utils/nm-jansson.h"
#endif
#endif /* __NM_JSON_H__ */

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

@ -39,7 +39,6 @@
#include "nm-json.h"
#endif
#include "nm-utils/nm-jansson.h"
#include "nm-utils/nm-enum-utils.h"
#include "nm-common-macros.h"
#include "nm-utils-private.h"