From 26880c3a8a937255c7d07666bb4726e528f6d5ae Mon Sep 17 00:00:00 2001
From: polluks <polluks@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Sun, 22 Feb 2015 01:09:59 +0000
Subject: [PATCH] Trying backport

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@50099 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 workbench/classes/datatypes/html/Makefile    | 8 +++++++-
 workbench/classes/datatypes/html/common.h    | 3 +--
 workbench/classes/datatypes/html/htmlclass.c | 6 ++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/workbench/classes/datatypes/html/Makefile b/workbench/classes/datatypes/html/Makefile
index 8d96b1a6a5..a1a9a37737 100644
--- a/workbench/classes/datatypes/html/Makefile
+++ b/workbench/classes/datatypes/html/Makefile
@@ -1,7 +1,7 @@
 #   $Id$
 #   This Makefile creates a standalone application for debugging with console only
 
-CFLAGS	+= -O -Wall
+CFLAGS	+= -O2 #-Wall
 
 OBJS = main.o tables.o parse.o layout.o
 
@@ -17,5 +17,11 @@ parse.o: tables.h
 
 tables.o: parse.h
 
+html.datatype: htmlclass.o tables.o parse.o layout.o
+	gcc -o $@ htmlclass.o tables.o parse.o #layout.o
+
 clean:
 	rm -f *.o *.bak parser
+
+install:
+	copy html.datatype SYS:Classes/Datatypes/
diff --git a/workbench/classes/datatypes/html/common.h b/workbench/classes/datatypes/html/common.h
index eb7bd2b019..ff579f74b6 100644
--- a/workbench/classes/datatypes/html/common.h
+++ b/workbench/classes/datatypes/html/common.h
@@ -12,6 +12,7 @@
 #endif
 
 typedef char* string;
+#define G(o) ((struct Gadget *)(o))
 #ifdef __AROS__
 #include <clib/alib_protos.h>
 #include <proto/exec.h>
@@ -19,7 +20,6 @@ typedef char* string;
 #define MFREE(pool,ptr)
 typedef unsigned char u_char;
 typedef unsigned short u_short;
-#define G(o) ((struct Gadget *)(o))
 #undef DEBUG
 #define DEBUG 1
 #include <aros/debug.h>
@@ -174,4 +174,3 @@ struct _layout_struct
 	para_flags	paraflags;
 	style_flags	styleflags;
 };
-
diff --git a/workbench/classes/datatypes/html/htmlclass.c b/workbench/classes/datatypes/html/htmlclass.c
index 415611e1ee..52a164a61f 100644
--- a/workbench/classes/datatypes/html/htmlclass.c
+++ b/workbench/classes/datatypes/html/htmlclass.c
@@ -43,8 +43,14 @@
 
 #include <aros/symbolsets.h>
 
+#ifdef __AROS__
 /* Open superclass */
 ADD2LIBS("datatypes/text.datatype", 0, struct Library *, TextBase);
+#else
+#define AROS_SLOWSTACKTAGS_PRE(tag1) int
+#define AROS_SLOWSTACKTAGS_ARG(tag1) tag1
+#define AROS_SLOWSTACKTAGS_POST
+#endif /* __AROS__ */
 
 /*******************************************************************************************/
 /* Parser */
-- 
2.11.4.GIT