[PATCH vd_agent_linux v2 6/7] Unify config.h inclusion style

[Frediano Ziglio <fziglio@xxxxxxxxxx>]

Remove HAVE_CONFIG_H check, is always defined.
Remove indentation of includes, now not in a condition and also
some were indented some not.

Signed-off-by: Frediano Ziglio <fziglio@xxxxxxxxxx>
---
 src/udscs.c              | 2 --
 src/vdagent/audio.c      | 3 ---
 src/vdagent/clipboard.c  | 5 +----
 src/vdagent/file-xfers.c | 5 +----
 src/vdagent/vdagent.c    | 5 +----
 src/vdagent/x11-randr.c  | 2 +-
 src/vdagent/x11.c        | 4 +---
 src/vdagentd/uinput.c    | 2 --
 src/vdagentd/vdagentd.c  | 2 --
 src/vdagentd/xorg-conf.c | 2 --
 10 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/src/udscs.c b/src/udscs.c
index fe2cf8c..32bd6e6 100644
--- a/src/udscs.c
+++ b/src/udscs.c
@@ -20,9 +20,7 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/vdagent/audio.c b/src/vdagent/audio.c
index e823569..1056d2e 100644
--- a/src/vdagent/audio.c
+++ b/src/vdagent/audio.c
@@ -15,10 +15,7 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <glib.h>
 #include <syslog.h>
diff --git a/src/vdagent/clipboard.c b/src/vdagent/clipboard.c
index 667c168..6b01a7b 100644
--- a/src/vdagent/clipboard.c
+++ b/src/vdagent/clipboard.c
@@ -15,10 +15,7 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #ifdef WITH_GTK
 # include <gtk/gtk.h>
diff --git a/src/vdagent/file-xfers.c b/src/vdagent/file-xfers.c
index 0fabe7e..b5aedd0 100644
--- a/src/vdagent/file-xfers.c
+++ b/src/vdagent/file-xfers.c
@@ -18,10 +18,7 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/vdagent/vdagent.c b/src/vdagent/vdagent.c
index 0916029..17860c2 100644
--- a/src/vdagent/vdagent.c
+++ b/src/vdagent/vdagent.c
@@ -18,10 +18,7 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/vdagent/x11-randr.c b/src/vdagent/x11-randr.c
index fec160f..192b888 100644
--- a/src/vdagent/x11-randr.c
+++ b/src/vdagent/x11-randr.c
@@ -20,8 +20,8 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 #include <config.h>
+
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <string.h>
diff --git a/src/vdagent/x11.c b/src/vdagent/x11.c
index bc37a0e..49b4b57 100644
--- a/src/vdagent/x11.c
+++ b/src/vdagent/x11.c
@@ -31,9 +31,7 @@
    Calling XPending when-ever we return to the mainloop also ensures any
    pending writes are flushed. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <glib.h>
 #ifdef WITH_GTK
diff --git a/src/vdagentd/uinput.c b/src/vdagentd/uinput.c
index 3172891..4f854bf 100644
--- a/src/vdagentd/uinput.c
+++ b/src/vdagentd/uinput.c
@@ -19,9 +19,7 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdlib.h>
 #include <syslog.h>
diff --git a/src/vdagentd/vdagentd.c b/src/vdagentd/vdagentd.c
index 8fa1534..a3ec5bf 100644
--- a/src/vdagentd/vdagentd.c
+++ b/src/vdagentd/vdagentd.c
@@ -19,9 +19,7 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/vdagentd/xorg-conf.c b/src/vdagentd/xorg-conf.c
index 9f3dac5..97aaacb 100644
--- a/src/vdagentd/xorg-conf.c
+++ b/src/vdagentd/xorg-conf.c
@@ -18,9 +18,7 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #ifdef HAVE_PCIACCESS
 #include <pciaccess.h>
-- 
2.20.1

_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel