[network-manager-openvpn/th/include-nm-default-bgo761198: 3/8] all: remove #ifdef HAVE_CONFIG_H check



commit c4e6d2619120f3062fcbb7e72dce73f3ffbe1902
Author: Thomas Haller <thaller redhat com>
Date:   Wed Jan 27 15:46:07 2016 +0100

    all: remove #ifdef HAVE_CONFIG_H check
    
    Also include "config.h" in all source files and
    include the header with quotation marks.

 auth-dialog/main.c                      |    4 +---
 common/utils.c                          |    2 ++
 properties/auth-helpers.c               |    4 +---
 properties/import-export.c              |    4 +---
 properties/nm-openvpn.c                 |    4 +---
 properties/tests/test-import-export.c   |    2 ++
 src/nm-openvpn-service-openvpn-helper.c |    2 ++
 src/nm-openvpn-service.c                |    5 +----
 8 files changed, 11 insertions(+), 16 deletions(-)
---
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index ad4e675..786e5c5 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -22,9 +22,7 @@
  *               2005 Tim Niemueller [www.niemueller.de]
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <errno.h>
 #include <string.h>
diff --git a/common/utils.c b/common/utils.c
index 4d0425a..239512e 100644
--- a/common/utils.c
+++ b/common/utils.c
@@ -19,6 +19,8 @@
  * (C) Copyright 2010 Red Hat, Inc.
  */
 
+#include "config.h"
+
 #include <string.h>
 
 #include "nm-default.h"
diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c
index 4b364ba..a980d0c 100644
--- a/properties/auth-helpers.c
+++ b/properties/auth-helpers.c
@@ -21,9 +21,7 @@
  *
  **************************************************************************/
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <string.h>
 #include <sys/types.h>
diff --git a/properties/import-export.c b/properties/import-export.c
index 3c2a8a2..abe2783 100644
--- a/properties/import-export.c
+++ b/properties/import-export.c
@@ -19,9 +19,7 @@
  *
  **************************************************************************/
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <string.h>
 #include <sys/types.h>
diff --git a/properties/nm-openvpn.c b/properties/nm-openvpn.c
index 81b31a7..7871a04 100644
--- a/properties/nm-openvpn.c
+++ b/properties/nm-openvpn.c
@@ -25,9 +25,7 @@
  *
  **************************************************************************/
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/properties/tests/test-import-export.c b/properties/tests/test-import-export.c
index 6e25e74..d95a7f8 100644
--- a/properties/tests/test-import-export.c
+++ b/properties/tests/test-import-export.c
@@ -18,6 +18,8 @@
  *
  */
 
+#include "config.h"
+
 #include <string.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/src/nm-openvpn-service-openvpn-helper.c b/src/nm-openvpn-service-openvpn-helper.c
index 7be7ff3..23088bb 100644
--- a/src/nm-openvpn-service-openvpn-helper.c
+++ b/src/nm-openvpn-service-openvpn-helper.c
@@ -26,6 +26,8 @@
  * 
  */
 
+#include "config.h"
+
 #include <glib.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c
index 3bfb93e..2f9efbd 100644
--- a/src/nm-openvpn-service.c
+++ b/src/nm-openvpn-service.c
@@ -22,10 +22,7 @@
  *
  */
 
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <stdio.h>
 #include <string.h>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]