[kaffe] CVS kaffe (robilad): For for PROMOTE_* problems on amd64

[Kaffe CVS]

PatchSet 5359 
Date: 2004/10/24 20:59:47
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
For for PROMOTE_* problems on amd64

2004-10-24  Eric Anholt  <eta at lclark.edu>

        * kaffe/kaffevm/support.c: Fixup for the commit to avoid undefined
        macro warnings for PROMOTE_* an NO_HOLES, because defined(MACRO) is true
        even if MACRO is 0.  Set the macros to 0 when they're unset rather than
        using defined().

Members: 
	ChangeLog:1.2911->1.2912 
	kaffe/kaffevm/support.c:1.74->1.75 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2911 kaffe/ChangeLog:1.2912
--- kaffe/ChangeLog:1.2911	Sun Oct 24 19:23:31 2004
+++ kaffe/ChangeLog	Sun Oct 24 20:59:47 2004
@@ -1,3 +1,10 @@
+2004-10-24  Eric Anholt  <eta at lclark.edu>
+
+	* kaffe/kaffevm/support.c: Fixup for the commit to avoid undefined
+	macro warnings for PROMOTE_* an NO_HOLES, because defined(MACRO) is true
+	even if MACRO is 0.  Set the macros to 0 when they're unset rather than
+	using defined().
+
 2004-10-24  Dalibor Topic  <robilad at kaffe.org>
 
 	* libraries/javalib/Makefile.am,
Index: kaffe/kaffe/kaffevm/support.c
diff -u kaffe/kaffe/kaffevm/support.c:1.74 kaffe/kaffe/kaffevm/support.c:1.75
--- kaffe/kaffe/kaffevm/support.c:1.74	Tue Oct 12 17:00:10 2004
+++ kaffe/kaffe/kaffevm/support.c	Sun Oct 24 20:59:49 2004
@@ -310,9 +310,22 @@
 # endif
 #endif
 
+/* Make sure that undefined macros are defined as 0 */
+#if !defined(PROMOTE_jfloat2jdouble)
+#define PROMOTE_jfloat2jdouble 0
+#endif
+
+#if !defined(PROMOTE_jint2jlong)
+#define PROMOTE_jint2jlong 0
+#endif
+
+#if !defined(NO_HOLES)
+#define NO_HOLES 0
+#endif
+
 /* If PROMOTE_jint2jlong is enabled, all integer values are to be
    passed as jlongs.  It is only set by PROMOTE_TO_64bits.  */
-#if defined(PROMOTE_jint2jlong)
+#if PROMOTE_jint2jlong
 # define PROM_i j
 #else
 # define PROM_i i
@@ -323,7 +336,7 @@
    be marked as 'D'.  No known port uses this.  In fact, alpha must
    explicitly set it to 0, to prevent PROMOTE_TO_64bits from enabling
    it.  */
-#if defined(PROMOTE_jfloat2jdouble)
+#if PROMOTE_jfloat2jdouble
 # define PROM_f d
 #else
 # define PROM_f f
@@ -334,7 +347,7 @@
    padding integer argument. The argument DO is used to adjust the
    input argument list.  */
 #if defined(ALIGN_AT_64bits)
-# if defined(NO_HOLES)
+# if NO_HOLES
 #  error "ALIGN_AT_64bits is incompatible with NO_HOLES"
 # endif
 # define ENSURE_ALIGN64(DO) do { \
@@ -351,15 +364,6 @@
 #else
 # define ENSURE_ALIGN64(DO) do {} while (0)
 #endif
-
-/* Finally, make sure that undefined symbols are defined as 0 */
-#if ! defined(PROMOTE_jfloat2jdouble)
-#define PROMOTE_jfloat2jdouble	0
-#endif /* ! defined(PROMOTE_jfloat2jdouble) */ 
-
-#if ! defined(NO_HOLES)
-#define NO_HOLES	0
-#endif /*  ! defined(NO_HOLES) */
 
 /**
  * Generic routine to call a native or Java method (array style).