d984b2ce4a
From the files under "shared/nm-utils" we build an internal library
that provides glib-based helper utilities.
Move the files of that basic library to a new subdirectory
"shared/nm-glib-aux" and rename the helper library "libnm-core-base.la"
to "libnm-glib-aux.la".
Reasons:
- the name "utils" is overused in our code-base. Everything's an
"utils". Give this thing a more distinct name.
- there were additional files under "shared/nm-utils", which are not
part of this internal library "libnm-utils-base.la". All the files
that are part of this library should be together in the same
directory, but files that are not, should not be there.
- the new name should better convey what this library is and what is isn't:
it's a set of utilities and helper functions that extend glib with
funcitonality that we commonly need.
There are still some files left under "shared/nm-utils". They have less
a unifying propose to be in their own directory, so I leave them there
for now. But at least they are separate from "shared/nm-glib-aux",
which has a very clear purpose.
(cherry picked from commit 80db06f768)
52 lines
2.3 KiB
C
52 lines
2.3 KiB
C
/*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*
|
|
* Copyright 2017, 2018 Red Hat, Inc.
|
|
*/
|
|
#ifndef __NM_JSON_H__
|
|
#define __NM_JSON_H__
|
|
|
|
gboolean nm_jansson_load (void);
|
|
|
|
#ifndef NM_JANSSON_C
|
|
#define json_object_iter_value (*_nm_jansson_json_object_iter_value)
|
|
#define json_object_key_to_iter (*_nm_jansson_json_object_key_to_iter)
|
|
#define json_integer (*_nm_jansson_json_integer)
|
|
#define json_object_del (*_nm_jansson_json_object_del)
|
|
#define json_array_get (*_nm_jansson_json_array_get)
|
|
#define json_array_size (*_nm_jansson_json_array_size)
|
|
#define json_array_append_new (*_nm_jansson_json_array_append_new)
|
|
#define json_string (*_nm_jansson_json_string)
|
|
#define json_object_iter_next (*_nm_jansson_json_object_iter_next)
|
|
#define json_loads (*_nm_jansson_json_loads)
|
|
#define json_dumps (*_nm_jansson_json_dumps)
|
|
#define json_object_iter_key (*_nm_jansson_json_object_iter_key)
|
|
#define json_object (*_nm_jansson_json_object)
|
|
#define json_object_get (*_nm_jansson_json_object_get)
|
|
#define json_array (*_nm_jansson_json_array)
|
|
#define json_false (*_nm_jansson_json_false)
|
|
#define json_delete (*_nm_jansson_json_delete)
|
|
#define json_true (*_nm_jansson_json_true)
|
|
#define json_object_size (*_nm_jansson_json_object_size)
|
|
#define json_object_set_new (*_nm_jansson_json_object_set_new)
|
|
#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-glib-aux/nm-jansson.h"
|
|
#endif
|
|
|
|
#endif /* __NM_JSON_H__ */
|