summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2008-10-24 15:25:23 +0000
committerTom Tromey <tromey@redhat.com>2008-10-24 15:25:23 +0000
commit97c632e531b8352cf210a603eae846955b2181a9 (patch)
treedc1c47ed86d82d76c3b52128639fd9c4e898026a
parent893c3329f0fcf2bb039e216948234f8ffcd58f50 (diff)
downloadclasspath-97c632e531b8352cf210a603eae846955b2181a9.tar.gz
2008-10-23 David Edelsohn <edelsohn@gnu.org>
* native/fdlibm/fdlibm.h: Undef hz.
-rw-r--r--ChangeLog4
-rw-r--r--native/fdlibm/fdlibm.h8
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3f561a669..1bed65a36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-23 David Edelsohn <edelsohn@gnu.org>
+
+ * native/fdlibm/fdlibm.h: Undef hz.
+
2008-10-20 Andrew John Hughes <gnu_andrew@member.fsf.org>
* m4/ac_prog_antlr.m4:
diff --git a/native/fdlibm/fdlibm.h b/native/fdlibm/fdlibm.h
index 112504e4c..fc10ecc9c 100644
--- a/native/fdlibm/fdlibm.h
+++ b/native/fdlibm/fdlibm.h
@@ -24,6 +24,14 @@
#include <config.h>
#include <stdlib.h>
+/*
+ * AIX includes a header that defines hz,
+ * which conflicts with an fdlibm variable in some functions.
+ */
+#ifdef _AIX
+#undef hz
+#endif
+
/* GCJ LOCAL: Include files. */
#include "ieeefp.h"
/* CLASSPATH LOCAL: */