* sysdeps/m68k/fpu/bits/mathinline.h (isinf): Avoid conflict with

C9x macro.
Wed Sep  9 10:34:06 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/m68k/fpu/bits/mathinline.h (isinf): Avoid conflict with
	C9x macro.

diff --git a/ChangeLog b/ChangeLog
index 361f8cf146403a30be779bb983b01e759237d7b1..fcd7bedfd6d7953181ba7a3ee861dbc0347bee01 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep  9 10:34:06 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+       * sysdeps/m68k/fpu/bits/mathinline.h (isinf): Avoid conflict with
+       C9x macro.
+
 1998-09-08  Ulrich Drepper  <drepper@cygnus.com>
 
        * csu/initfini.c: Don't define __gmon_start__ if WEAK_GMON_START is

diff --git a/sysdeps/m68k/fpu/bits/mathinline.h b/sysdeps/m68k/fpu/bits/mathinline.h
index e5eb591e3061f5a3231ab8f7b62f6a9c9c29838c..b1e2a75f1b354eb0a6a348b7bbd7c87d5024565e 100644 (file)
--- a/sysdeps/m68k/fpu/bits/mathinline.h
+++ b/sysdeps/m68k/fpu/bits/mathinline.h
@@ -442,7 +442,9 @@ __inline_forward(double,frexp, (double __value, int *__expptr),
 __inline_forward_c(double,floor, (double __x), (__x))
 __inline_forward_c(double,ceil, (double __x), (__x))
 # ifdef __USE_MISC
+#  ifndef __USE_ISOC9X /* Conflict with macro of same name.  */
 __inline_forward_c(int,isinf, (double __value), (__value))
+#  endif
 __inline_forward_c(int,finite, (double __value), (__value))
 __inline_forward_c(double,scalbn, (double __x, int __n), (__x, __n))
 # endif