# HG changeset patch
# User Jaroslav Hajek <highegg@gmail.com>
# Date 1216976198 -7200
# Node ID ff6c1534b522b7199b326bb1183b8fe6934f6e00
# Parent  f8514786c490ffc25988014dbe1165eea2a93c6d
[mq]: log2

diff --git a/liboctave/ChangeLog b/liboctave/ChangeLog
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-28  Jaroslav Hajek <highegg@gmail.com>
+
+	* lo-math.h: Ensure log2 is undefined from cmath in C++ mode.
+
 2008-07-21  Michael Goffioul  <michael.goffioul@gmail.com>
 
 	* oct-mutex.h (octave_base_mutex::octave_base_mutex): Initialize
diff --git a/liboctave/lo-math.h b/liboctave/lo-math.h
--- a/liboctave/lo-math.h
+++ b/liboctave/lo-math.h
@@ -25,6 +25,10 @@
 
 #if defined (__cplusplus)
 #include <cmath>
+// if #undef log2 is missing in cmath, undef it here
+#if defined (log2)
+#undef log2
+#endif
 #else
 #include <math.h>
 #endif