• Dan Winship's avatar
    all: fix up multiple-include-guard defines · c81fb49a
    Dan Winship authored
    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
nm-setting-vpn.h 4.84 KB