2010-01-08  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>

	* libc/include/math.h (log2, log2f): Disable macro versions for C++,
	as they are incompatible with OpenMP/C++ headers.

Index: libc/include/math.h
===================================================================
RCS file: /cvs/src/src/newlib/libc/include/math.h,v
retrieving revision 1.44
diff -u -r1.44 math.h
--- libc/include/math.h	17 Nov 2009 22:35:46 -0000	1.44
+++ libc/include/math.h	8 Jan 2010 06:49:14 -0000
@@ -275,7 +275,9 @@
 extern double erf _PARAMS((double));
 extern double erfc _PARAMS((double));
 extern double log2 _PARAMS((double));
+#if !defined(__cplusplus)
 #define log2(x) (log (x) / _M_LOG2_E)
+#endif
 
 #ifndef __math_68881
 extern double hypot _PARAMS((double, double));
@@ -353,7 +355,9 @@
 extern float erff _PARAMS((float));
 extern float erfcf _PARAMS((float));
 extern float log2f _PARAMS((float));
+#if !defined(__cplusplus)
 #define log2f(x) (logf (x) / (float) _M_LOG2_E)
+#endif
 extern float hypotf _PARAMS((float, float));
 #endif /* ! defined (_REENT_ONLY) */