questionable patch: merge of a lot of stuff from the svg branch

[org.ibex.core.git] / src / org / ibex / plat / Linux.cc

diff --git a/src/org/ibex/plat/Linux.cc b/src/org/ibex/plat/Linux.cc
index e96c23c..82d53f9 100644 (file)
--- a/src/org/ibex/plat/Linux.cc
+++ b/src/org/ibex/plat/Linux.cc
@@ -1,7 +1,16 @@
-#include <stdint.h>
-#include "X11.cc"
+// Copyright 2000-2005 the Contributors, as shown in the revision logs.
+// Licensed under the GNU General Public License version 2 ("the License").
+// You may not use this file except in compliance with the License.
 
+// IMPORTANT: inclusion order: always include gcjh'ed headers first, then superclass cc's, then system headers
+#undef file
+#include <stdint.h>
+#include <java/lang/Class.h>
+#include <org/ibex/js/JS.h>
+#include <org/ibex/util/Log.h>
 #include <org/ibex/plat/Linux.h>
+#include "X11.cc"
+#include <stdint.h>
 
 // we love libgcj!
 extern const char **_Jv_argv;