mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-14 20:18:39 +00:00
build: rename file "include/nm-utils-internal.h" to "nm-macros-internal.h"
We already have "nm-utils*.h" and "NetworkManagerUtils.h" headers. Rename "include/nm-utils-internal.h" to "nm-macros-internal.h". I think that name is better, because this file is header-only, internal, and repository-wide. Also, it will never contain non-header-only declarations because there is no backing object file under "include/". It will only contain macros and inline functions.
This commit is contained in:
parent
dce00f0d10
commit
b8b1a01d96
|
@ -29,7 +29,7 @@
|
|||
#include "common.h"
|
||||
#include "settings.h"
|
||||
#include "nm-glib-compat.h"
|
||||
#include "nm-utils-internal.h"
|
||||
#include "nm-macros-internal.h"
|
||||
|
||||
/* Forward declarations */
|
||||
static char *wep_key_type_to_string (NMWepKeyType type);
|
||||
|
|
|
@ -4,6 +4,6 @@ EXTRA_DIST = \
|
|||
nm-glib-compat.h \
|
||||
nm-gvaluearray-compat.h \
|
||||
nm-test-utils.h \
|
||||
nm-utils-internal.h
|
||||
nm-macros-internal.h
|
||||
|
||||
CLEANFILES=nm-version.h
|
||||
|
|
|
@ -19,8 +19,8 @@
|
|||
* (C) Copyright 2014 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#ifndef __NM_UTILS_INTERNAL_H__
|
||||
#define __NM_UTILS_INTERNAL_H__
|
||||
#ifndef __NM_MACROS_INTERNAL_H__
|
||||
#define __NM_MACROS_INTERNAL_H__
|
||||
|
||||
|
||||
#include <glib.h>
|
||||
|
@ -191,4 +191,4 @@ nm_clear_g_source (guint *id)
|
|||
|
||||
/*****************************************************************************/
|
||||
|
||||
#endif
|
||||
#endif /* __NM_MACROS_INTERNAL_H__ */
|
|
@ -92,7 +92,7 @@
|
|||
#include <errno.h>
|
||||
|
||||
#include "nm-utils.h"
|
||||
#include "nm-utils-internal.h"
|
||||
#include "nm-macros-internal.h"
|
||||
#include "nm-glib-compat.h"
|
||||
#include "gsystem-local-alloc.h"
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
#include <glib/gi18n-lib.h>
|
||||
|
||||
#include "nm-core-internal.h"
|
||||
#include "nm-utils-internal.h"
|
||||
#include "nm-macros-internal.h"
|
||||
#include "gsystem-local-alloc.h"
|
||||
#include "nm-glib-compat.h"
|
||||
#include "nm-keyfile-internal.h"
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
#include "nm-utils-private.h"
|
||||
#include "nm-setting-private.h"
|
||||
#include "nm-core-enum-types.h"
|
||||
#include "nm-utils-internal.h"
|
||||
#include "nm-macros-internal.h"
|
||||
#include "gsystem-local-alloc.h"
|
||||
|
||||
/**
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
#include "nm-setting-private.h"
|
||||
#include "crypto.h"
|
||||
#include "gsystem-local-alloc.h"
|
||||
#include "nm-utils-internal.h"
|
||||
#include "nm-macros-internal.h"
|
||||
|
||||
#include "nm-setting-bond.h"
|
||||
#include "nm-setting-bridge.h"
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include "nm-utils-internal.h"
|
||||
#include "nm-macros-internal.h"
|
||||
#include "nm-keyfile-utils.h"
|
||||
#include "nm-keyfile-internal.h"
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
#include "crypto.h"
|
||||
#include "nm-utils-private.h"
|
||||
#include "nm-setting-private.h"
|
||||
#include "nm-utils-internal.h"
|
||||
#include "nm-macros-internal.h"
|
||||
|
||||
/**
|
||||
* SECTION:nm-setting-8021x
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
#include "nm-dbus-glib-types.h"
|
||||
#include "nm-setting-private.h"
|
||||
#include "crypto.h"
|
||||
#include "nm-utils-internal.h"
|
||||
#include "nm-macros-internal.h"
|
||||
|
||||
/* Embed the commit id in the build binary */
|
||||
static const char *const __nm_git_sha = STRLEN (NM_GIT_SHA) > 0 ? "NM_GIT_SHA:"NM_GIT_SHA : "";
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#include "nm-platform.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "gsystem-local-alloc.h"
|
||||
#include "nm-utils-internal.h"
|
||||
#include "nm-macros-internal.h"
|
||||
|
||||
#define CLIENTID_TAG "send dhcp-client-identifier"
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#include "nm-utils.h"
|
||||
#include "nm-ip4-config.h"
|
||||
#include "nm-platform.h"
|
||||
#include "nm-utils-internal.h"
|
||||
#include "nm-macros-internal.h"
|
||||
#include "nm-logging.h"
|
||||
|
||||
#include "nm-test-utils.h"
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#include <glib.h>
|
||||
#include <glib-object.h>
|
||||
|
||||
#include "nm-utils-internal.h"
|
||||
#include "nm-macros-internal.h"
|
||||
|
||||
/* Log domains */
|
||||
typedef enum { /*< skip >*/
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include <string.h>
|
||||
|
||||
#include "nm-core-internal.h"
|
||||
#include "nm-utils-internal.h"
|
||||
#include "nm-macros-internal.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
|
||||
#include "utils.h"
|
||||
|
|
Loading…
Reference in a new issue