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.

(cherry picked from commit b8b1a01d96)
This commit is contained in:
Thomas Haller 2015-06-01 13:42:08 +02:00
parent 88bdeecf7c
commit 1d3c143948
10 changed files with 12 additions and 12 deletions

View file

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

View file

@ -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__ */

View file

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

View file

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

View file

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

View file

@ -23,7 +23,7 @@
#include <glib.h>
#include "nm-utils-internal.h"
#include "nm-macros-internal.h"
NM_PRAGMA_WARNING_DISABLE("-Wstrict-prototypes")
#include <WiMaxType.h>

View file

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

View file

@ -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"
#define DEBUG 1

View file

@ -27,7 +27,7 @@
#include "nm-device.h"
#include "gsystem-local-alloc.h"
#include "nm-core-internal.h"
#include "nm-utils-internal.h"
#include "nm-macros-internal.h"
typedef struct {
char *group_name;

View file

@ -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 >*/