Fix MinGW-Bug [2160227]: Eliminate conflicting declarations and implementations of...

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index beb934b..aa09e8f 100644 (file)
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-13  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+       Fix MinGW-Bug [2160227]
+       Eliminate conflicting declarations and implementations of scalb().
+
+       * moldname.def.in (scalb): Comment out of EXPORTS list.
+       * include/math.h (scalb): Comment out OLDNAMES prototype; it conflicts
+       with GCC's built-in declaration.
+
 2008-10-12  Christopher Faylor  <me+cygwin@cgf.cx>
 
        * Makefile.in: Use a different method to invoke gcc in a cygwin-hosted

diff --git a/winsup/mingw/include/math.h b/winsup/mingw/include/math.h
index abe899e..0577d0c 100644 (file)
--- a/winsup/mingw/include/math.h
+++ b/winsup/mingw/include/math.h
@@ -259,7 +259,14 @@ _CRTIMP double __cdecl y1 (double);
 _CRTIMP double __cdecl yn (int, double);
 
 _CRTIMP double __cdecl chgsign (double);
+/*
+ * scalb() is a GCC built-in.
+ * Exclude this _scalb() stub; the semantics are incompatible
+ * with the built-in implementation.
+ *
 _CRTIMP double __cdecl scalb (double, long);
+ *
+ */
 _CRTIMP int __cdecl finite (double);
 _CRTIMP int __cdecl fpclass (double);
 

diff --git a/winsup/mingw/moldname.def.in b/winsup/mingw/moldname.def.in
index 9480f6d..b8bae6b 100644 (file)
--- a/winsup/mingw/moldname.def.in
+++ b/winsup/mingw/moldname.def.in
@@ -141,7 +141,10 @@ y0
 y1
 yn
 chgsign
-scalb
+; omit scalb...
+; it would conflict with the GCC built-in, which exhibits
+; semantics differing from the MSVCRT implementation.
+;scalb
 finite
 fpclass
 ; C99 functions