diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-10-30 11:29:56 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-11-02 13:57:02 +0100 |
| commit | d61875c960003631f61add97ac6d0ea732804552 (patch) | |
| tree | 8c0d7ee5b9cc40c2f7bdb517890e3ae90f6d3b0c | |
| parent | 4b1e1f8aabcc61337b04ebd5ce956327b2e7ce03 (diff) | |
| download | NetworkManager-d61875c960003631f61add97ac6d0ea732804552.tar.gz | |
libnm: add internal header file "nm-core-types-internal.h"
This shall contain type definitions, with similar use
to "nm-core-internal.h".
However, it should contain a minimal set, so that we can include this
header in other headers under "src/", without including the whole
"nm-core-internal.h" in headers.
| -rw-r--r-- | docs/libnm/Makefile.am | 1 | ||||
| -rw-r--r-- | libnm-core/Makefile.libnm-core | 1 | ||||
| -rw-r--r-- | libnm-core/nm-core-internal.h | 1 | ||||
| -rw-r--r-- | libnm-core/nm-core-types-internal.h | 25 |
4 files changed, 28 insertions, 0 deletions
diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am index 23631ddc24..5b96d5aaa2 100644 --- a/docs/libnm/Makefile.am +++ b/docs/libnm/Makefile.am @@ -39,6 +39,7 @@ IGNORE_HFILES= \ nm-dbus-helpers.h \ nm-core-internal.h \ nm-core-types.h \ + nm-core-types-internal.h \ nm-device-private.h \ nm-dhcp4-config.h \ nm-dhcp6-config.h \ diff --git a/libnm-core/Makefile.libnm-core b/libnm-core/Makefile.libnm-core index b5e205acef..fb201bdbad 100644 --- a/libnm-core/Makefile.libnm-core +++ b/libnm-core/Makefile.libnm-core @@ -51,6 +51,7 @@ libnm_core_private_headers = \ $(core)/crypto.h \ $(core)/nm-connection-private.h \ $(core)/nm-core-internal.h \ + $(core)/nm-core-types-internal.h \ $(core)/nm-keyfile-internal.h \ $(core)/nm-keyfile-utils.h \ $(core)/nm-property-compare.h \ diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 09e42d2c05..b78a996ea6 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -67,6 +67,7 @@ #include "nm-simple-connection.h" #include "nm-utils.h" #include "nm-vpn-dbus-interface.h" +#include "nm-core-types-internal.h" /* NM_SETTING_COMPARE_FLAG_INFERRABLE: check whether a device-generated * connection can be replaced by a already-defined connection. This flag only diff --git a/libnm-core/nm-core-types-internal.h b/libnm-core/nm-core-types-internal.h new file mode 100644 index 0000000000..5a6d70ee66 --- /dev/null +++ b/libnm-core/nm-core-types-internal.h @@ -0,0 +1,25 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ + +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * (C) Copyright 2015 Red Hat, Inc. + */ + +#ifndef NM_CORE_TYPES_INTERNAL_H +#define NM_CORE_TYPES_INTERNAL_H + +#endif /* NM_CORE_TYPES_INTERNAL_H */ |