summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston Sequoia <jeremyhu@apple.com>2013-11-28 11:59:53 -0800
committerJeremy Huddleston Sequoia <jeremyhu@apple.com>2013-11-28 11:59:53 -0800
commit336f8633837abe4a1e5ba84b53ac8b9dac5d29a2 (patch)
tree13f7a07043a7d55a84ac582b7c0a57ddc7a7dfe9
parent05492b038e7773aa8f90449387cde89e10bc614c (diff)
Always include config.h first
This fixes some build warnings about CSRG_BASED being redefined due to incorrect header include ordering. Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-rw-r--r--shared/vmmouse_client.c4
-rw-r--r--shared/vmmouse_proto.c4
-rw-r--r--shared/vmmouse_proto.h5
-rw-r--r--tools/vmmouse_detect.c8
4 files changed, 12 insertions, 9 deletions
diff --git a/shared/vmmouse_client.c b/shared/vmmouse_client.c
index f34c223..b8e19d6 100644
--- a/shared/vmmouse_client.c
+++ b/shared/vmmouse_client.c
@@ -35,6 +35,10 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "vmmouse_client.h"
#include "vmmouse_proto.h"
diff --git a/shared/vmmouse_proto.c b/shared/vmmouse_proto.c
index b50e071..635c522 100644
--- a/shared/vmmouse_proto.c
+++ b/shared/vmmouse_proto.c
@@ -33,6 +33,10 @@
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "vmmouse_proto.h"
diff --git a/shared/vmmouse_proto.h b/shared/vmmouse_proto.h
index 9d7cb22..714f8c5 100644
--- a/shared/vmmouse_proto.h
+++ b/shared/vmmouse_proto.h
@@ -36,11 +36,6 @@
#ifndef _VMMOUSE_PROTO_H_
#define _VMMOUSE_PROTO_H_
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
#include <stdint.h>
#ifdef HAVE_XORG_SERVER_1_1_0
diff --git a/tools/vmmouse_detect.c b/tools/vmmouse_detect.c
index ac238b4..7939ff8 100644
--- a/tools/vmmouse_detect.c
+++ b/tools/vmmouse_detect.c
@@ -26,14 +26,14 @@
*/
-#include <stdlib.h>
-#include <signal.h>
-#include "vmmouse_client.h"
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#include <stdlib.h>
+#include <signal.h>
+#include "vmmouse_client.h"
+
void
segvCB(int sig)
{