diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 78ce466c6..5136fa41f 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-11  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.
+
 2010-01-10  Corinna Vinschen  <corinna@vinschen.de>
 
 	* libc/stdlib/mbtowc_r.c (__ascii_mbtowc): Disallow conversion of
diff --git a/newlib/libc/include/math.h b/newlib/libc/include/math.h
index 7571e46a0..6e9da28f6 100644
--- a/newlib/libc/include/math.h
+++ b/newlib/libc/include/math.h
@@ -275,7 +275,9 @@ extern double lgamma _PARAMS((double));
 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 lgammaf _PARAMS((float));
 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) */