diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-09-25 15:47:55 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-09-25 15:48:09 +0200 |
| commit | 0e223d4961e96c6bfc0ecc78ea08a9276b952e00 (patch) | |
| tree | c6759d278d317a26acb5eb12c0d046d1be8c7153 | |
| parent | 159e827a72f420048e12d318f8ba1edd3f641fc8 (diff) | |
| download | NetworkManager-0e223d4961e96c6bfc0ecc78ea08a9276b952e00.tar.gz | |
libnm: include "glib.h" in "nm-version.h"
This is a forward port of commit 6f616d4c4b04d5478f60d0311317bc84c5459ea4
which added this patch on nm-1-0 branch.
However, the reason stated there is wrong because we don't need this
to fix Qt examples. Building Qt examples was fixed in that "nm-dbus-interface.h"
no longer drags in "nm-version.h".
On the other hand, we still want "nm-version.h" to be self-contained,
and include "glib.h" as it needs it.
| -rw-r--r-- | libnm-core/nm-version.h.in | 2 | ||||
| -rw-r--r-- | libnm-util/nm-version.h.in | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libnm-core/nm-version.h.in b/libnm-core/nm-version.h.in index 3ba7cfd832..8ae0df6a5f 100644 --- a/libnm-core/nm-version.h.in +++ b/libnm-core/nm-version.h.in @@ -21,6 +21,8 @@ #ifndef NM_VERSION_H #define NM_VERSION_H +#include <glib.h> + /** * NM_MAJOR_VERSION: * diff --git a/libnm-util/nm-version.h.in b/libnm-util/nm-version.h.in index 3ba7cfd832..8ae0df6a5f 100644 --- a/libnm-util/nm-version.h.in +++ b/libnm-util/nm-version.h.in @@ -21,6 +21,8 @@ #ifndef NM_VERSION_H #define NM_VERSION_H +#include <glib.h> + /** * NM_MAJOR_VERSION: * |