colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

all: fix up multiple-include-guard defines

Browse Source 
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.
This commit is contained in:
Dan Winship
2014-08-13 14:10:11 -04:00
parent 76ac21b26d
commit c81fb49aa5
184 changed files with 519 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nm-session-utils.h
View File

@@ -17,8 +17,8 @@
* Author: Dan Williams <dcbw@redhat.com>
*/
#ifndef NM_SESSION_UTILS_H
#define NM_SESSION_UTILS_H
#ifndef __NETWORKMANAGER_SESSION_UTILS_H__
#define __NETWORKMANAGER_SESSION_UTILS_H__
#include <glib.h>
#include <glib-object.h>