From ad5db89b499d4737b8d6cc20d1e1dcf1efcb6440 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@netsurf-browser.org>
Date: Thu, 9 Aug 2012 16:26:57 +0100
Subject: Fix include and structure definition to stop compiler redefinition
 errors

---
 javascript/jsapi.h           | 5 ++---
 javascript/jsapi/console.c   | 3 ++-
 javascript/jsapi/document.c  | 5 ++---
 javascript/jsapi/element.c   | 6 +++---
 javascript/jsapi/navigator.c | 4 ++--
 javascript/jsapi/window.c    | 5 ++---
 6 files changed, 13 insertions(+), 15 deletions(-)

(limited to 'javascript')

diff --git a/javascript/jsapi.h b/javascript/jsapi.h
index 98b7d0228..2c10d02ce 100644
--- a/javascript/jsapi.h
+++ b/javascript/jsapi.h
@@ -29,6 +29,8 @@
 #include "mozjs/jsapi.h"
 #endif
 
+#include "render/html_internal.h"
+
 #if JS_VERSION <= 180
 
 #include <string.h>
@@ -136,9 +138,6 @@ JS_NewCompartmentAndGlobalObject(JSContext *cx,
 
 #endif
 
-typedef struct dom_element dom_element;
-typedef struct html_content html_content;
-
 /** Create a new javascript window object
  *
  * @param cx The javascript context.
diff --git a/javascript/jsapi/console.c b/javascript/jsapi/console.c
index 6a3cc1801..6a6d7d3c3 100644
--- a/javascript/jsapi/console.c
+++ b/javascript/jsapi/console.c
@@ -16,10 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "javascript/jsapi.h"
 
 #include "utils/log.h"
 
+#include "javascript/jsapi.h"
+
 static JSBool JSAPI_NATIVE(debug, JSContext *cx, uintN argc, jsval *vp)
 {
 	JSAPI_SET_RVAL(cx, vp, JSVAL_VOID);
diff --git a/javascript/jsapi/document.c b/javascript/jsapi/document.c
index 77de4e0e2..a40ce2011 100644
--- a/javascript/jsapi/document.c
+++ b/javascript/jsapi/document.c
@@ -18,12 +18,11 @@
 
 #include <dom/dom.h>
 
-
-#include "javascript/jsapi.h"
 #include "utils/config.h"
-#include "render/html_internal.h"
 #include "utils/log.h"
 
+#include "javascript/jsapi.h"
+
 /* IDL http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#interface-document
 
 CAUTION - write, writeln are not part of the DOM they come from:
diff --git a/javascript/jsapi/element.c b/javascript/jsapi/element.c
index 7878393da..8ea7017d5 100644
--- a/javascript/jsapi/element.c
+++ b/javascript/jsapi/element.c
@@ -18,11 +18,11 @@
 
 #include <dom/dom.h>
 
-
-#include "javascript/jsapi.h"
 #include "utils/config.h"
-#include "render/html_internal.h"
 #include "utils/log.h"
+#include "render/html_internal.h"
+
+#include "javascript/jsapi.h"
 
 /* IDL http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#interface-element
 
diff --git a/javascript/jsapi/navigator.c b/javascript/jsapi/navigator.c
index 64f30c94b..88fc5351a 100644
--- a/javascript/jsapi/navigator.c
+++ b/javascript/jsapi/navigator.c
@@ -19,8 +19,6 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "javascript/jsapi.h"
-
 #include "desktop/netsurf.h"
 #include "desktop/options.h"
 
@@ -29,6 +27,8 @@
 #include "utils/log.h"
 #include "utils/utsname.h"
 
+#include "javascript/jsapi.h"
+
 /*
  * navigator properties for netsurf
  * 
diff --git a/javascript/jsapi/window.c b/javascript/jsapi/window.c
index 0b7673be3..4f7e75109 100644
--- a/javascript/jsapi/window.c
+++ b/javascript/jsapi/window.c
@@ -16,11 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "javascript/jsapi.h"
-
-#include "content/content.h"
 #include "utils/log.h"
 
+#include "javascript/jsapi.h"
+
 /* IDL
 
 [NamedPropertiesObject]
-- 
cgit v1.2.3