From a614de78050ab07f137957cf0a6a15e77d867c3e Mon Sep 17 00:00:00 2001
From: weissms <weissms@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Wed, 3 Aug 2011 17:42:42 +0000
Subject: [PATCH] struct Node is the same for all flavours now.

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@40530 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 test/uae-tmpl/nodes.h    | 18 +-----------------
 test/uae/nodes.h         | 18 +-----------------
 workbench/demos/font2c.c |  9 +--------
 3 files changed, 3 insertions(+), 42 deletions(-)

diff --git a/test/uae-tmpl/nodes.h b/test/uae-tmpl/nodes.h
index cd9ce64367..331240e8c4 100644
--- a/test/uae-tmpl/nodes.h
+++ b/test/uae-tmpl/nodes.h
@@ -1,37 +1,21 @@
 #ifndef EXEC_NODES_H
 #define EXEC_NODES_H
-/* Copyright © 1995, The AROS Development Team. All rights reserved. */
+/* Copyright © 1995-2011, The AROS Development Team. All rights reserved. */
 
 #include "aros_types.h"
 
 typedef be_ptr<struct Node> NodePtr;
 typedef be_ptr<struct MinNode> MinNodePtr;
 
-#if (AROS_FLAVOUR & AROS_FLAVOUR_BINCOMPAT)
 struct Node
 {
     NodePtr ln_Succ,
 	    ln_Pred;
     UBYTE   ln_Type;
     BYTE    ln_Pri;
-    /* AROS: pointer should be 32bit aligned, but we can not do this on
-       the native machine because of binary compatibility.
-    */
     STRPTR  ln_Name;
 };
 
-#else
-struct Node
-{
-    NodePtr ln_Succ,
-	    ln_Pred;
-    /* AROS: pointer should be 32bit aligned */
-    STRPTR  ln_Name;
-    UBYTE   ln_Type;
-    BYTE    ln_Pri;
-};
-#endif /* AROS_FLAVOUR */
-
 struct MinNode
 {
     MinNodePtr mln_Succ,
diff --git a/test/uae/nodes.h b/test/uae/nodes.h
index a39d2a1f2e..397753e106 100644
--- a/test/uae/nodes.h
+++ b/test/uae/nodes.h
@@ -1,6 +1,6 @@
 #ifndef EXEC_NODES_H
 #define EXEC_NODES_H
-/* Copyright © 1995, The AROS Development Team. All rights reserved. */
+/* Copyright © 1995-2011, The AROS Development Team. All rights reserved. */
 
 /******************************************************************************
 
@@ -96,7 +96,6 @@ public:
 	       Structures
 **************************************/
 
-#if (AROS_FLAVOUR & AROS_FLAVOUR_BINCOMPAT)
 struct Node
 {
     NodePtr ln_Succ,
@@ -112,21 +111,6 @@ public:
     inline Node () { return; }
 };
 
-#else
-struct Node
-{
-    NodePtr ln_Succ,
-	    ln_Pred;
-    /* AROS: pointer should be 32bit aligned */
-    STRPTR  ln_Name;
-    UBYTE   ln_Type;
-    BYTE    ln_Pri;
-
-public:
-    inline Node () { return; }
-};
-#endif /* AROS_FLAVOUR */
-
 struct MinNode
 {
     MinNodePtr mln_Succ,
diff --git a/workbench/demos/font2c.c b/workbench/demos/font2c.c
index ffbc58793f..2382f8955b 100644
--- a/workbench/demos/font2c.c
+++ b/workbench/demos/font2c.c
@@ -1,5 +1,5 @@
 /*
-    Copyright © 1997-98, The AROS Development Team. All rights reserved.
+    Copyright © 1997-2011, The AROS Development Team. All rights reserved.
     $Id$
 
     Desc: Convert Amiga font to C code.
@@ -270,16 +270,9 @@ static VOID font2c(struct TextFont *tf, FILE * fh, STRPTR prestring)
     fprintf(fh, "\t\t\tNULL,\n");	/* ln_Succ */
     fprintf(fh, "\t\t\tNULL,\n");	/* ln_Pred */
 
-/* See <exec/nodes.h> */
-#if (AROS_FLAVOUR & AROS_FLAVOUR_BINCOMPAT)
     fprintf(fh, "\t\t\t%d,\n", tf->tf_Message.mn_Node.ln_Type);	/* ln_Type */
     fprintf(fh, "\t\t\t0,\n");	/* ln_Pri */
     fprintf(fh, "\t\t\t\"%s\"\n", tf->tf_Message.mn_Node.ln_Name);
-#else
-    fprintf(fh, "\t\t\t\"%s\",\n", tf->tf_Message.mn_Node.ln_Name);
-    fprintf(fh, "\t\t\t%d,\n", tf->tf_Message.mn_Node.ln_Type);	/* ln_Type */
-    fprintf(fh, "\t\t\t0\n");	/* ln_Pri */
-#endif
     fprintf(fh, "\t\t},\n");
     fprintf(fh, "\t\tNULL,\n");	/* mn_ReplyPort	*/
     fprintf(fh, "\t\t0\n");	/* mn_Length	*/
-- 
2.11.4.GIT