STC compilation fixes development
authorJan Vrany <jan.vrany@fit.cvut.cz>
Fri, 15 Feb 2013 18:47:45 +0000
branchdevelopment
changeset 2071 6dec85a75935
parent 2069 75d40b7b986f
child 2072 c1b50b78bcd0
STC compilation fixes
JavaZipSupport.st
Make.spec
libInit.cc
--- a/JavaZipSupport.st	Thu Feb 14 16:15:31 2013 +0000
+++ b/JavaZipSupport.st	Fri Feb 15 18:47:45 2013 +0000
@@ -41,6 +41,24 @@
 	privateIn:JavaZipSupport
 !
 
+!JavaZipSupport primitiveDefinitions!
+%{
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include "zlib.h"
+
+#define MIN2(x, y)  ((x) < (y) ? (x) : (y))
+
+#define DEF_MEM_LEVEL 8
+#define __zStreamVal(x) ((z_stream *)(__ExternalBytesInstPtr(x)->e_address))
+
+%}
+! !
+
+
 !JavaZipSupport class methodsFor:'documentation'!
 
 copyright
--- a/Make.spec	Thu Feb 14 16:15:31 2013 +0000
+++ b/Make.spec	Fri Feb 15 18:47:45 2013 +0000
@@ -97,7 +97,6 @@
 	JavaSocket \
 	JavaSourceCodeCache \
 	JavaSourceFileWriter \
-	JavaStartup \
 	JavaTestsLoader \
 	JavaTopView \
 	JavaUnresolvedConstant \
@@ -227,7 +226,6 @@
     $(OUTDIR_SLASH)JavaSocket.$(O) \
     $(OUTDIR_SLASH)JavaSourceCodeCache.$(O) \
     $(OUTDIR_SLASH)JavaSourceFileWriter.$(O) \
-    $(OUTDIR_SLASH)JavaStartup.$(O) \
     $(OUTDIR_SLASH)JavaTestsLoader.$(O) \
     $(OUTDIR_SLASH)JavaTopView.$(O) \
     $(OUTDIR_SLASH)JavaUnresolvedConstant.$(O) \
--- a/libInit.cc	Thu Feb 14 16:15:31 2013 +0000
+++ b/libInit.cc	Fri Feb 15 18:47:45 2013 +0000
@@ -78,7 +78,6 @@
 _JavaSocket_Init(pass,__pRT__,snd);
 _JavaSourceCodeCache_Init(pass,__pRT__,snd);
 _JavaSourceFileWriter_Init(pass,__pRT__,snd);
-_JavaStartup_Init(pass,__pRT__,snd);
 _JavaTestsLoader_Init(pass,__pRT__,snd);
 _JavaTopView_Init(pass,__pRT__,snd);
 _JavaUnresolvedConstant_Init(pass,__pRT__,snd);