From e152ec7bf4ba252ff9d3eb13eabd417b931dac9a Mon Sep 17 00:00:00 2001
From: Iain Lane <iain@orangesquash.org.uk>
Date: Mon, 24 Sep 2018 09:29:55 +0100
Subject: Import Upstream version 1.12.2

---
 libnm/nm-libnm-utils.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'libnm/nm-libnm-utils.h')

diff --git a/libnm/nm-libnm-utils.h b/libnm/nm-libnm-utils.h
index 4a5a361c..9b48b0a7 100644
--- a/libnm/nm-libnm-utils.h
+++ b/libnm/nm-libnm-utils.h
@@ -15,12 +15,17 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301 USA.
  *
- * Copyright 2017 Red Hat, Inc.
+ * Copyright 2017, 2018 Red Hat, Inc.
  */
 
 #ifndef __NM_LIBNM_UTILS_H__
 #define __NM_LIBNM_UTILS_H__
 
-char *nm_utils_fixup_desc_string (const char *desc);
+#if !((NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_PRIVATE)
+#error Cannot use this header.
+#endif
+
+char *nm_utils_fixup_vendor_string (const char *desc);
+char *nm_utils_fixup_product_string (const char *desc);
 
 #endif /* __NM_LIBNM_UTILS_H__ */
-- 
cgit 1.3.0-6-gf8a5