diff options
| author | Michael Biebl <biebl@debian.org> | 2016-03-01 16:56:10 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-03-01 16:56:10 +0100 |
| commit | e62b307a9dd108e664aa507355ed3dd15a9c6d67 (patch) | |
| tree | 2957d1a0dde11be8bd9f506f8b075d21b85da2d0 /libnm-util/nm-utils.c | |
| parent | de39787fedbff438bd933c30675fc5c026db6aa0 (diff) | |
| parent | c2de0d98ba39e0a1a970d066fd19be786092f376 (diff) | |
Merge tag 'upstream/1.1.91'
Upstream version 1.1.91
Diffstat (limited to 'libnm-util/nm-utils.c')
| -rw-r--r-- | libnm-util/nm-utils.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c index 1659a1a3..7c9def1d 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -19,7 +19,9 @@ * Copyright 2005 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" + +#include "nm-utils.h" #include <string.h> #include <stdlib.h> @@ -29,17 +31,14 @@ #include <libintl.h> #include <gmodule.h> -#include "nm-default.h" #include "nm-gvaluearray-compat.h" -#include "nm-utils.h" #include "nm-utils-private.h" #include "nm-dbus-glib-types.h" #include "nm-setting-private.h" #include "crypto.h" -#include "nm-macros-internal.h" /* Embed the commit id in the build binary */ -static const char *const __nm_git_sha = STRLEN (NM_GIT_SHA) > 0 ? "NM_GIT_SHA:"NM_GIT_SHA : ""; +static const char *const __nm_git_sha = NM_STRLEN (NM_GIT_SHA) > 0 ? "NM_GIT_SHA:"NM_GIT_SHA : ""; /** * SECTION:nm-utils |