2019-09-10 11:19:01 +02:00
|
|
|
// SPDX-License-Identifier: GPL-2.0+
|
2019-09-25 13:13:40 +02:00
|
|
|
/*
|
2011-05-02 22:38:51 -05:00
|
|
|
* Copyright (C) 2008 - 2011 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_DISPATCHER_UTILS_H__
|
|
|
|
|
#define __NETWORKMANAGER_DISPATCHER_UTILS_H__
|
2011-05-02 22:38:51 -05:00
|
|
|
|
|
|
|
|
char **
|
|
|
|
|
nm_dispatcher_utils_construct_envp (const char *action,
|
2014-09-03 12:27:33 -04:00
|
|
|
GVariant *connection_dict,
|
|
|
|
|
GVariant *connection_props,
|
|
|
|
|
GVariant *device_props,
|
2016-08-16 05:55:59 +05:30
|
|
|
GVariant *device_proxy_props,
|
2014-09-03 12:27:33 -04:00
|
|
|
GVariant *device_ip4_props,
|
|
|
|
|
GVariant *device_ip6_props,
|
|
|
|
|
GVariant *device_dhcp4_props,
|
|
|
|
|
GVariant *device_dhcp6_props,
|
2016-07-20 16:24:41 +01:00
|
|
|
const char *connectivity_state,
|
2011-05-02 22:38:51 -05:00
|
|
|
const char *vpn_ip_iface,
|
2016-08-16 05:55:59 +05:30
|
|
|
GVariant *vpn_proxy_props,
|
2014-09-03 12:27:33 -04:00
|
|
|
GVariant *vpn_ip4_props,
|
|
|
|
|
GVariant *vpn_ip6_props,
|
2015-08-04 10:51:32 +02:00
|
|
|
char **out_iface,
|
|
|
|
|
const char **out_error_message);
|
2011-05-02 22:38:51 -05:00
|
|
|
|
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_DISPATCHER_UTILS_H__ */
|
2011-05-02 22:38:51 -05:00
|
|
|
|