aboutsummaryrefslogtreecommitdiff
path: root/libjava/classpath
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/classpath')
-rw-r--r--libjava/classpath/ChangeLog6
-rw-r--r--libjava/classpath/native/fdlibm/mprec.c9
2 files changed, 13 insertions, 2 deletions
diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 4d9f1a6e49c..4389fc05507 100644
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,9 @@
+2014-05-13 Bernd Edlinger <bernd.edlinger@hotmail.de>
+
+ Fix current cygwin-64 build problems.
+ * native/fdlibm/mprec.c (_REENT_CHECK_MP, _REENT_MP_FREELIST,
+ _REENT_MP_P5S, __ULong, __Long): Undefine previous definitions.
+
2013-09-20 Alan Modra <amodra@gmail.com>
* configure: Regenerate.
diff --git a/libjava/classpath/native/fdlibm/mprec.c b/libjava/classpath/native/fdlibm/mprec.c
index 8a7cdc03968..460c301054d 100644
--- a/libjava/classpath/native/fdlibm/mprec.c
+++ b/libjava/classpath/native/fdlibm/mprec.c
@@ -93,12 +93,17 @@
#define _reent _Jv_reent
#define _Bigint _Jv_Bigint
+#undef _REENT_CHECK_MP
#define _REENT_CHECK_MP(x)
+#undef _REENT_MP_FREELIST
#define _REENT_MP_FREELIST(x) ((x)->_freelist)
+#undef _REENT_MP_P5S
#define _REENT_MP_P5S(x) ((x)->_p5s)
-typedef unsigned long __ULong;
-typedef long __Long;
+#undef __ULong
+#define __ULong unsigned long
+#undef __Long
+#define __Long long
static void *
mprec_calloc (void *ignore, size_t x1, size_t x2)