2014-07-06 16:53:02 -04:00
|
|
|
/* -*- 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.
|
|
|
|
|
*
|
|
|
|
|
* Copyright 2014 Red Hat, Inc.
|
|
|
|
|
*/
|
|
|
|
|
|
all: fix up multiple-include-guard defines
Previously, src/nm-ip4-config.h, libnm/nm-ip4-config.h, and
libnm-glib/nm-ip4-config.h all used "NM_IP4_CONFIG_H" as an include
guard, which meant that nm-test-utils.h could not tell which of them
was being included (and so, eg, if you tried to include
nm-ip4-config.h in a libnm test, it would fail to compile because
nm-test-utils.h was referring to symbols in src/nm-ip4-config.h).
Fix this by changing the include guards in the non-API-stable parts of
the tree:
- libnm-glib/nm-ip4-config.h remains NM_IP4_CONFIG_H
- libnm/nm-ip4-config.h now uses __NM_IP4_CONFIG_H__
- src/nm-ip4-config.h now uses __NETWORKMANAGER_IP4_CONFIG_H__
And likewise for all other headers.
The two non-"nm"-prefixed headers, libnm/NetworkManager.h and
src/NetworkManagerUtils.h are now __NETWORKMANAGER_H__ and
__NETWORKMANAGER_UTILS_H__ respectively, which, while not entirely
consistent with the general scheme, do still mostly make sense in
isolation.
2014-08-13 14:10:11 -04:00
|
|
|
#ifndef __NETWORKMANAGER_H__
|
|
|
|
|
#define __NETWORKMANAGER_H__
|
2014-07-06 16:53:02 -04:00
|
|
|
|
|
|
|
|
#define __NETWORKMANAGER_H_INSIDE__
|
|
|
|
|
|
|
|
|
|
#include <nm-access-point.h>
|
|
|
|
|
#include <nm-active-connection.h>
|
|
|
|
|
#include <nm-client.h>
|
|
|
|
|
#include <nm-connection.h>
|
|
|
|
|
#include <nm-core-enum-types.h>
|
|
|
|
|
#include <nm-dbus-interface.h>
|
|
|
|
|
#include <nm-device-adsl.h>
|
|
|
|
|
#include <nm-device-bond.h>
|
|
|
|
|
#include <nm-device-bridge.h>
|
|
|
|
|
#include <nm-device-bt.h>
|
|
|
|
|
#include <nm-device-ethernet.h>
|
|
|
|
|
#include <nm-device-generic.h>
|
|
|
|
|
#include <nm-device-infiniband.h>
|
|
|
|
|
#include <nm-device-modem.h>
|
|
|
|
|
#include <nm-device-olpc-mesh.h>
|
|
|
|
|
#include <nm-device-team.h>
|
|
|
|
|
#include <nm-device-vlan.h>
|
|
|
|
|
#include <nm-device-wifi.h>
|
|
|
|
|
#include <nm-device-wimax.h>
|
|
|
|
|
#include <nm-device.h>
|
|
|
|
|
#include <nm-dhcp4-config.h>
|
|
|
|
|
#include <nm-dhcp6-config.h>
|
|
|
|
|
#include <nm-enum-types.h>
|
|
|
|
|
#include <nm-ip4-config.h>
|
|
|
|
|
#include <nm-ip6-config.h>
|
|
|
|
|
#include <nm-object.h>
|
|
|
|
|
#include <nm-remote-connection.h>
|
|
|
|
|
#include <nm-remote-settings.h>
|
|
|
|
|
#include <nm-secret-agent.h>
|
|
|
|
|
#include <nm-setting-8021x.h>
|
|
|
|
|
#include <nm-setting-adsl.h>
|
|
|
|
|
#include <nm-setting-bluetooth.h>
|
|
|
|
|
#include <nm-setting-bond.h>
|
|
|
|
|
#include <nm-setting-bridge-port.h>
|
|
|
|
|
#include <nm-setting-bridge.h>
|
|
|
|
|
#include <nm-setting-cdma.h>
|
|
|
|
|
#include <nm-setting-connection.h>
|
|
|
|
|
#include <nm-setting-dcb.h>
|
|
|
|
|
#include <nm-setting-generic.h>
|
|
|
|
|
#include <nm-setting-gsm.h>
|
|
|
|
|
#include <nm-setting-infiniband.h>
|
|
|
|
|
#include <nm-setting-ip4-config.h>
|
|
|
|
|
#include <nm-setting-ip6-config.h>
|
|
|
|
|
#include <nm-setting-olpc-mesh.h>
|
|
|
|
|
#include <nm-setting-ppp.h>
|
|
|
|
|
#include <nm-setting-pppoe.h>
|
|
|
|
|
#include <nm-setting-serial.h>
|
|
|
|
|
#include <nm-setting-team-port.h>
|
|
|
|
|
#include <nm-setting-team.h>
|
|
|
|
|
#include <nm-setting-vlan.h>
|
|
|
|
|
#include <nm-setting-vpn.h>
|
|
|
|
|
#include <nm-setting-wimax.h>
|
|
|
|
|
#include <nm-setting-wired.h>
|
|
|
|
|
#include <nm-setting-wireless-security.h>
|
|
|
|
|
#include <nm-setting-wireless.h>
|
|
|
|
|
#include <nm-setting.h>
|
|
|
|
|
#include <nm-types.h>
|
|
|
|
|
#include <nm-utils.h>
|
|
|
|
|
#include <nm-version.h>
|
|
|
|
|
#include <nm-vpn-connection.h>
|
|
|
|
|
#include <nm-vpn-dbus-interface.h>
|
|
|
|
|
#include <nm-wimax-nsp.h>
|
|
|
|
|
|
|
|
|
|
#undef __NETWORKMANAGER_H_INSIDE__
|
|
|
|
|
|
all: fix up multiple-include-guard defines
Previously, src/nm-ip4-config.h, libnm/nm-ip4-config.h, and
libnm-glib/nm-ip4-config.h all used "NM_IP4_CONFIG_H" as an include
guard, which meant that nm-test-utils.h could not tell which of them
was being included (and so, eg, if you tried to include
nm-ip4-config.h in a libnm test, it would fail to compile because
nm-test-utils.h was referring to symbols in src/nm-ip4-config.h).
Fix this by changing the include guards in the non-API-stable parts of
the tree:
- libnm-glib/nm-ip4-config.h remains NM_IP4_CONFIG_H
- libnm/nm-ip4-config.h now uses __NM_IP4_CONFIG_H__
- src/nm-ip4-config.h now uses __NETWORKMANAGER_IP4_CONFIG_H__
And likewise for all other headers.
The two non-"nm"-prefixed headers, libnm/NetworkManager.h and
src/NetworkManagerUtils.h are now __NETWORKMANAGER_H__ and
__NETWORKMANAGER_UTILS_H__ respectively, which, while not entirely
consistent with the general scheme, do still mostly make sense in
isolation.
2014-08-13 14:10:11 -04:00
|
|
|
#endif /* __NETWORKMANAGER_H__ */
|