c81fb49aa5
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.
59 lines
2.0 KiB
C
59 lines
2.0 KiB
C
/* -*- 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 2008 Red Hat, Inc.
|
|
*/
|
|
|
|
#ifndef __NM_TYPES_H__
|
|
#define __NM_TYPES_H__
|
|
|
|
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
|
|
#error "Only <NetworkManager.h> can be included directly."
|
|
#endif
|
|
|
|
#include <glib.h>
|
|
#include <glib-object.h>
|
|
|
|
#include <nm-enum-types.h>
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
#define NM_TYPE_SSID (nm_ssid_get_type ())
|
|
GType nm_ssid_get_type (void) G_GNUC_CONST;
|
|
|
|
#define NM_TYPE_UINT_ARRAY (nm_uint_array_get_type ())
|
|
GType nm_uint_array_get_type (void) G_GNUC_CONST;
|
|
|
|
#define NM_TYPE_STRING_ARRAY (nm_string_array_get_type ())
|
|
GType nm_string_array_get_type (void) G_GNUC_CONST;
|
|
|
|
#define NM_TYPE_OBJECT_ARRAY (nm_object_array_get_type ())
|
|
GType nm_object_array_get_type (void) G_GNUC_CONST;
|
|
|
|
#define NM_TYPE_IP6_ADDRESS_OBJECT_ARRAY (nm_ip6_address_object_array_get_type ())
|
|
GType nm_ip6_address_object_array_get_type (void) G_GNUC_CONST;
|
|
|
|
#define NM_TYPE_IP6_ADDRESS_ARRAY (nm_ip6_address_array_get_type ())
|
|
GType nm_ip6_address_array_get_type (void) G_GNUC_CONST;
|
|
|
|
#define NM_TYPE_IP6_ROUTE_OBJECT_ARRAY (nm_ip6_route_object_array_get_type ())
|
|
GType nm_ip6_route_object_array_get_type (void) G_GNUC_CONST;
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* __NM_TYPES_H__ */
|