summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <Sam@XPS-SUSE.site>2008-12-12 10:07:12 +0900
committerSam Spilsbury <Sam@XPS-SUSE.site>2008-12-12 10:07:12 +0900
commite9dd7190b38bcc3c0ab61f1e187aea06f24fef4c (patch)
treeddc3e4e32a23a11adbe3734ebb29c25d10595128
parentec9b9bd955061cb3975755521c082e0cd84eefa6 (diff)
downloadwiimote-e9dd7190b38bcc3c0ab61f1e187aea06f24fef4c.tar.gz
wiimote-e9dd7190b38bcc3c0ab61f1e187aea06f24fef4c.tar.bz2
* Only need to include "wiimote_options.h" once in the -internal.h file and only need to declare 'int wiimoteDisplayPrivateIndex' once.
-rw-r--r--action.c3
-rw-r--r--callback.c3
-rw-r--r--connect.c3
-rw-r--r--gesture.c3
-rw-r--r--option.c3
-rw-r--r--report.c2
-rw-r--r--wiimote-internal.h1
-rw-r--r--wiimote.c1
8 files changed, 1 insertions, 18 deletions
diff --git a/action.c b/action.c
index aca1962..0b1613e 100644
--- a/action.c
+++ b/action.c
@@ -19,9 +19,6 @@
*/
#include "wiimote-internal.h"
-#include "wiimote_options.h"
-
-int wiimoteDisplayPrivateIndex;
/* Callable Actions --------------------------------------------------- */
diff --git a/callback.c b/callback.c
index cf58323..6e0fe35 100644
--- a/callback.c
+++ b/callback.c
@@ -19,9 +19,6 @@
*/
#include "wiimote-internal.h"
-#include "wiimote_options.h"
-
-int wiimoteDisplayPrivateIndex;
/* Prototype cwiid_callback with cwiid_callback_t, define it with the actual
diff --git a/connect.c b/connect.c
index 4a6a764..7e63056 100644
--- a/connect.c
+++ b/connect.c
@@ -19,9 +19,6 @@
*/
#include "wiimote-internal.h"
-#include "wiimote_options.h"
-
-int wiimoteDisplayPrivateIndex;
/* Wii Remote Connection / Handling --------------------------------------------------- */
diff --git a/gesture.c b/gesture.c
index fa26880..ef28365 100644
--- a/gesture.c
+++ b/gesture.c
@@ -19,9 +19,6 @@
*/
#include "wiimote-internal.h"
-#include "wiimote_options.h"
-
-int wiimoteDisplayPrivateIndex;
/* Gesturing and gesture checking --------------------------------------------- */
diff --git a/option.c b/option.c
index 8d064ff..e3b5fe5 100644
--- a/option.c
+++ b/option.c
@@ -19,9 +19,6 @@
*/
#include "wiimote-internal.h"
-#include "wiimote_options.h"
-
-int wiimoteDisplayPrivateIndex;
/* Option Initialisation --------------------------------------------------- */
diff --git a/report.c b/report.c
index ba4ff30..2d34a6d 100644
--- a/report.c
+++ b/report.c
@@ -20,8 +20,6 @@
#include "wiimote-internal.h"
-int wiimoteDisplayPrivateIndex;
-
/* Value Reporting --------------------------------------------------- */
Bool sendReports(void *vs)
diff --git a/wiimote-internal.h b/wiimote-internal.h
index 6815ae2..2151e45 100644
--- a/wiimote-internal.h
+++ b/wiimote-internal.h
@@ -19,6 +19,7 @@
*/
#include "compiz-wiimote.h"
+#include "wiimote_options.h"
#define MAX_GESTURES 32
#define MAX_REPORTS 16
diff --git a/wiimote.c b/wiimote.c
index 3bd9c24..ffc382a 100644
--- a/wiimote.c
+++ b/wiimote.c
@@ -21,7 +21,6 @@
* - ???
*/
#include "wiimote-internal.h"
-#include "wiimote_options.h"
static int corePrivateIndex;
int wiimoteDisplayPrivateIndex;