From c2de0d98ba39e0a1a970d066fd19be786092f376 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Tue, 1 Mar 2016 16:55:22 +0100
Subject: Imported Upstream version 1.1.91

---
 libnm-util/nm-utils.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'libnm-util/nm-utils.c')

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
-- 
cgit 1.3.0-6-gf8a5