[Spice-devel] [spice-gtk 09/11] Always use #include "config.h"
Christophe Fergeau
cfergeau at redhat.com
Thu Oct 30 05:56:42 PDT 2014
gnulib 'make syntax-check' prohibits use of #ifdef HAVE_CONFIG_H so this
commit removes it from where it's used. It also makes sure we always use
the same syntax for including config.h (#include "config.h" VS #include
<config.h>) as a consistent way of doing that is expected.
---
gtk/channel-display.c | 2 --
gtk/continuation.c | 2 +-
gtk/controller/dump.c | 2 --
gtk/controller/namedpipe.c | 2 +-
gtk/controller/namedpipeconnection.c | 2 +-
gtk/controller/namedpipelistener.c | 2 +-
gtk/controller/spice-controller-listener.c | 1 +
gtk/controller/spice-foreign-menu-listener.c | 1 +
gtk/controller/test.c | 2 --
gtk/controller/win32-util.c | 2 +-
gtk/coroutine_gthread.c | 2 +-
gtk/coroutine_ucontext.c | 2 +-
gtk/coroutine_winfibers.c | 2 +-
gtk/smartcard-manager-priv.h | 2 --
gtk/spice-audio.c | 2 --
gtk/spice-channel-priv.h | 2 --
gtk/spice-client-glib-usb-acl-helper.c | 4 +---
gtk/spice-client-gtk-module.c | 1 +
gtk/spice-cmdline.c | 4 +---
gtk/spice-grabsequence.c | 2 +-
gtk/spice-gstaudio.c | 2 --
gtk/spice-option.c | 4 +---
gtk/spice-util.c | 4 +---
gtk/spice-widget-priv.h | 2 --
gtk/spicy-screenshot.c | 4 +---
gtk/spicy-stats.c | 4 +---
gtk/spicy.c | 4 +---
gtk/usbutil.c | 4 +---
gtk/win-usb-dev.c | 2 --
gtk/win-usb-driver-install.c | 2 --
30 files changed, 20 insertions(+), 53 deletions(-)
diff --git a/gtk/channel-display.c b/gtk/channel-display.c
index 1e1312c..940a5a7 100644
--- a/gtk/channel-display.c
+++ b/gtk/channel-display.c
@@ -15,9 +15,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
diff --git a/gtk/continuation.c b/gtk/continuation.c
index e33d05a..adce858 100644
--- a/gtk/continuation.c
+++ b/gtk/continuation.c
@@ -17,7 +17,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <config.h>
+#include "config.h"
/* keep this above system headers, but below config.h */
#ifdef _FORTIFY_SOURCE
diff --git a/gtk/controller/dump.c b/gtk/controller/dump.c
index 5e951df..831a1d7 100644
--- a/gtk/controller/dump.c
+++ b/gtk/controller/dump.c
@@ -13,9 +13,7 @@
/* You should have received a copy of the GNU Lesser General Public */
/* License along with this library; if not, see <http://www.gnu.org/licenses/>. */
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <stdio.h>
#include <stdint.h>
diff --git a/gtk/controller/namedpipe.c b/gtk/controller/namedpipe.c
index 6859770..5312218 100644
--- a/gtk/controller/namedpipe.c
+++ b/gtk/controller/namedpipe.c
@@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-
+#include "config.h"
#include "namedpipe.h"
#include <windows.h>
diff --git a/gtk/controller/namedpipeconnection.c b/gtk/controller/namedpipeconnection.c
index 1e84e9f..3173b61 100644
--- a/gtk/controller/namedpipeconnection.c
+++ b/gtk/controller/namedpipeconnection.c
@@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-
+#include "config.h"
#include "namedpipeconnection.h"
#include <windows.h>
diff --git a/gtk/controller/namedpipelistener.c b/gtk/controller/namedpipelistener.c
index 28b2a4d..820c606 100644
--- a/gtk/controller/namedpipelistener.c
+++ b/gtk/controller/namedpipelistener.c
@@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-
+#include "config.h"
#include "namedpipelistener.h"
#include <windows.h>
diff --git a/gtk/controller/spice-controller-listener.c b/gtk/controller/spice-controller-listener.c
index 0189848..98baf33 100644
--- a/gtk/controller/spice-controller-listener.c
+++ b/gtk/controller/spice-controller-listener.c
@@ -15,6 +15,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
#include <glib.h>
#include <glib/gstdio.h>
diff --git a/gtk/controller/spice-foreign-menu-listener.c b/gtk/controller/spice-foreign-menu-listener.c
index 6693e21..5e62606 100644
--- a/gtk/controller/spice-foreign-menu-listener.c
+++ b/gtk/controller/spice-foreign-menu-listener.c
@@ -15,6 +15,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
#include <glib.h>
#include <glib/gstdio.h>
diff --git a/gtk/controller/test.c b/gtk/controller/test.c
index f426669..c08fe21 100644
--- a/gtk/controller/test.c
+++ b/gtk/controller/test.c
@@ -13,9 +13,7 @@
/* You should have received a copy of the GNU Lesser General Public */
/* License along with this library; if not, see <http://www.gnu.org/licenses/>. */
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <stdio.h>
#include <stdint.h>
diff --git a/gtk/controller/win32-util.c b/gtk/controller/win32-util.c
index ea68814..c3e0400 100644
--- a/gtk/controller/win32-util.c
+++ b/gtk/controller/win32-util.c
@@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-
+#include "config.h"
#include "win32-util.h"
#include <windows.h>
#include <sddl.h>
diff --git a/gtk/coroutine_gthread.c b/gtk/coroutine_gthread.c
index cfeac1a..b0098fa 100644
--- a/gtk/coroutine_gthread.c
+++ b/gtk/coroutine_gthread.c
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <config.h>
+#include "config.h"
#include "coroutine.h"
#include <stdio.h>
diff --git a/gtk/coroutine_ucontext.c b/gtk/coroutine_ucontext.c
index 46899e7..d709a33 100644
--- a/gtk/coroutine_ucontext.c
+++ b/gtk/coroutine_ucontext.c
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <config.h>
+#include "config.h"
#include <glib.h>
#ifdef HAVE_SYS_TYPES_H
diff --git a/gtk/coroutine_winfibers.c b/gtk/coroutine_winfibers.c
index 6f96c74..a56d33d 100644
--- a/gtk/coroutine_winfibers.c
+++ b/gtk/coroutine_winfibers.c
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <config.h>
+#include "config.h"
#include <stdio.h>
#include <glib.h>
diff --git a/gtk/smartcard-manager-priv.h b/gtk/smartcard-manager-priv.h
index f408d1f..409c1c5 100644
--- a/gtk/smartcard-manager-priv.h
+++ b/gtk/smartcard-manager-priv.h
@@ -18,9 +18,7 @@
#ifndef __SMARTCARD_MANAGER_PRIV_H__
#define __SMARTCARD_MANAGER_PRIV_H__
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <gio/gio.h>
#include "spice-session.h"
diff --git a/gtk/spice-audio.c b/gtk/spice-audio.c
index dbd3a8b..e7af7d5 100644
--- a/gtk/spice-audio.c
+++ b/gtk/spice-audio.c
@@ -32,9 +32,7 @@
* application, and connect them to the default sound system.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "spice-client.h"
#include "spice-common.h"
diff --git a/gtk/spice-channel-priv.h b/gtk/spice-channel-priv.h
index 6067abc..07012db 100644
--- a/gtk/spice-channel-priv.h
+++ b/gtk/spice-channel-priv.h
@@ -18,9 +18,7 @@
#ifndef __SPICE_CLIENT_CHANNEL_PRIV_H__
#define __SPICE_CLIENT_CHANNEL_PRIV_H__
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <openssl/ssl.h>
#include <gio/gio.h>
diff --git a/gtk/spice-client-glib-usb-acl-helper.c b/gtk/spice-client-glib-usb-acl-helper.c
index fe247ac..bc09776 100644
--- a/gtk/spice-client-glib-usb-acl-helper.c
+++ b/gtk/spice-client-glib-usb-acl-helper.c
@@ -20,9 +20,7 @@
with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
#include <ctype.h>
#include <errno.h>
diff --git a/gtk/spice-client-gtk-module.c b/gtk/spice-client-gtk-module.c
index e93b19d..b82f1e3 100644
--- a/gtk/spice-client-gtk-module.c
+++ b/gtk/spice-client-gtk-module.c
@@ -15,6 +15,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "config.h"
#include <pygobject.h>
void spice_register_classes (PyObject *d);
diff --git a/gtk/spice-cmdline.c b/gtk/spice-cmdline.c
index bb4b630..8619b57 100644
--- a/gtk/spice-cmdline.c
+++ b/gtk/spice-cmdline.c
@@ -15,9 +15,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
#include <glib/gi18n.h>
#include "spice-client.h"
diff --git a/gtk/spice-grabsequence.c b/gtk/spice-grabsequence.c
index 5d6fa9f..39adfb0 100644
--- a/gtk/spice-grabsequence.c
+++ b/gtk/spice-grabsequence.c
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <config.h>
+#include "config.h"
#include <string.h>
#include <gdk/gdk.h>
diff --git a/gtk/spice-gstaudio.c b/gtk/spice-gstaudio.c
index faa0c74..69bfa78 100644
--- a/gtk/spice-gstaudio.c
+++ b/gtk/spice-gstaudio.c
@@ -15,9 +15,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <gst/gst.h>
#include <gst/app/gstappsrc.h>
diff --git a/gtk/spice-option.c b/gtk/spice-option.c
index 05735ba..958e03c 100644
--- a/gtk/spice-option.c
+++ b/gtk/spice-option.c
@@ -15,9 +15,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
#include <stdlib.h>
#include <glib-object.h>
diff --git a/gtk/spice-util.c b/gtk/spice-util.c
index 4d26a30..bec237b 100644
--- a/gtk/spice-util.c
+++ b/gtk/spice-util.c
@@ -16,9 +16,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
#include <stdbool.h>
#include <stdlib.h>
diff --git a/gtk/spice-widget-priv.h b/gtk/spice-widget-priv.h
index 8be0644..9c38e2e 100644
--- a/gtk/spice-widget-priv.h
+++ b/gtk/spice-widget-priv.h
@@ -20,9 +20,7 @@
G_BEGIN_DECLS
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#ifdef WITH_X11
#include <X11/Xlib.h>
diff --git a/gtk/spicy-screenshot.c b/gtk/spicy-screenshot.c
index b60fb42..e7835bf 100644
--- a/gtk/spicy-screenshot.c
+++ b/gtk/spicy-screenshot.c
@@ -15,9 +15,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
#include <glib/gi18n.h>
#include "spice-client.h"
diff --git a/gtk/spicy-stats.c b/gtk/spicy-stats.c
index e236223..c98148d 100644
--- a/gtk/spicy-stats.c
+++ b/gtk/spicy-stats.c
@@ -15,9 +15,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
#include <glib/gi18n.h>
#include "spice-client.h"
diff --git a/gtk/spicy.c b/gtk/spicy.c
index 80d53b4..2fcd529 100644
--- a/gtk/spicy.c
+++ b/gtk/spicy.c
@@ -16,9 +16,7 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
#include <glib/gi18n.h>
#include <sys/stat.h>
diff --git a/gtk/usbutil.c b/gtk/usbutil.c
index 18fb14c..16d757b 100644
--- a/gtk/usbutil.c
+++ b/gtk/usbutil.c
@@ -19,9 +19,7 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
#include <glib-object.h>
#include <glib/gi18n.h>
diff --git a/gtk/win-usb-dev.c b/gtk/win-usb-dev.c
index 14ab7af..1e4b2d6 100644
--- a/gtk/win-usb-dev.c
+++ b/gtk/win-usb-dev.c
@@ -20,9 +20,7 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <windows.h>
#include <libusb.h>
diff --git a/gtk/win-usb-driver-install.c b/gtk/win-usb-driver-install.c
index 928b38f..e17287a 100644
--- a/gtk/win-usb-driver-install.c
+++ b/gtk/win-usb-driver-install.c
@@ -25,9 +25,7 @@
* Each installer (instance) requests driver installation for a single device.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <windows.h>
#include <gio/gio.h>
--
2.1.0
More information about the Spice-devel
mailing list