[kaffe] CVS kaffe (robilad): config/x86_64/common.h (ALIGNMENTOF_VOIDP_IN_STACK):

[Kaffe CVS]

PatchSet 7518 
Date: 2007/08/07 13:21:30
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
2007-08-07  Dalibor Topic  <robilad at kaffe.org>

        * config/x86_64/common.h (ALIGNMENTOF_VOIDP_IN_STACK):
        Undefine previous definition from defs.h, before redefining it.

Members: 
	ChangeLog:1.5016->1.5017 
	config/x86_64/common.h:1.7->1.8 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5016 kaffe/ChangeLog:1.5017
--- kaffe/ChangeLog:1.5016	Tue Aug  7 12:39:37 2007
+++ kaffe/ChangeLog	Tue Aug  7 13:21:30 2007
@@ -1,5 +1,10 @@
 2007-08-07  Dalibor Topic  <robilad at kaffe.org>
 
+	* config/x86_64/common.h (ALIGNMENTOF_VOIDP_IN_STACK):
+	Undefine previous definition from defs.h, before redefining it.
+	
+2007-08-07  Dalibor Topic  <robilad at kaffe.org>
+
 	* RELEASE-NOTES, TODO: Updated.
 	* FAQ.platform-status: Reformatted.
 
Index: kaffe/config/x86_64/common.h
diff -u kaffe/config/x86_64/common.h:1.7 kaffe/config/x86_64/common.h:1.8
--- kaffe/config/x86_64/common.h:1.7	Thu Sep 22 20:20:47 2005
+++ kaffe/config/x86_64/common.h	Tue Aug  7 13:21:30 2007
@@ -18,7 +18,10 @@
 #define NEED_STACK_ALIGN
 #define STACK_ALIGN(p)  ((((unsigned long)(p)) & 15) ^ (unsigned long)(p))
 /* However pointers are specially aligned on 4 bytes. */
-#define ALIGNMENTOF_VOIDP_IN_STACK 4
+#ifdef ALIGNMENTOF_VOIDP_IN_STACK
+#  undef ALIGNMENTOF_VOIDP_IN_STACK
+#  define ALIGNMENTOF_VOIDP_IN_STACK 4
+#endif
 
 /* This define will cause callMethodV and callMethodA to avoid
    introducing unused slots after jlongs and jdoubles.  */