X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fxwt%2Fplat%2FGCJ.cc;h=3050a2b617e8f2e668207a3f872bd79a7f256f70;hb=38786988d12f2c48a314ee37c326965ff0bcadb6;hp=9efbe82fccc33048a5490c13a6627e5c16812990;hpb=798082a9cf2856f50f91483da37b5d9661355f00;p=org.ibex.core.git

diff --git a/src/org/xwt/plat/GCJ.cc b/src/org/xwt/plat/GCJ.cc
index 9efbe82..3050a2b 100644
--- a/src/org/xwt/plat/GCJ.cc
+++ b/src/org/xwt/plat/GCJ.cc
@@ -5,12 +5,15 @@
 #include <gcj/cni.h>
 #include <gcj/array.h>
 extern "C" {
+
+// hack for broken Solaris headers
+#define _WCHAR_T
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <setjmp.h>
 #include "jpeglib.h"
 }
-#include <org/xwt/util/JSObject.h>
 #include <org/xwt/plat/GCJ.h>
 #include <java/io/InputStream.h>
 #include <java/io/ByteArrayInputStream.h>
@@ -22,15 +25,15 @@ extern "C" {
 
 // builtin.xwar /////////////////////////////////////////////////////////
 
-extern unsigned char builtin_xwar[];
-extern int builtin_xwar_length;
+extern unsigned char builtin_bytes[];
+extern int builtin_length;
 
 java::io::InputStream* org::xwt::plat::GCJ::_getBuiltinInputStream() {
-    jbyteArray ret = JvNewByteArray(builtin_xwar_length);
-    memcpy(elements(ret), builtin_xwar, builtin_xwar_length);
+    jbyteArray ret = JvNewByteArray(builtin_length);
+    memcpy(elements(ret), builtin_bytes, builtin_length);
     return new java::io::ByteArrayInputStream(ret);
 }
-           
+
 
 
 // JPEG ////////////////////////////////////////////////////////////////
@@ -122,3 +125,8 @@ void org::xwt::plat::GCJ$JPEG::nativeDecompress() {
     jpeg_destroy_decompress(&cinfo);
 }
 
+// C++ new/delete operators (JvMalloc never fails)
+void* operator new(size_t size) { return JvMalloc(size); }
+void* operator new[](size_t size) { return JvMalloc(size);}
+void operator delete(void *p) { JvFree(p); }
+void operator delete[](void *p) { JvFree(p); }