header inclusion fixes(?) for abs(int)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3146 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index 58c604d3c288e90d9cdc1befb5701ae732fc0100..a527ce79cfce709154672f5fb326cd81574c3a27 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-05  Allan Rae  <rae@lyx.org>
+
+       * lyxlength.C: Attempted a fix for the abs(int) header selection.
+       Works for 2.95.3, from what I understand of Garst's reports this should
+       work for other g++ versions.  We're screwed if the abs(int) definition
+       changed between bugfix releases of gcc.
+
 2001-12-04  John Levon  <moz@compsoc.man.ac.uk>
 
        * text.C: fix chapter label offset !

diff --git a/src/lyxlength.C b/src/lyxlength.C
index 2c52c7dbb8dd04937b923fcd12c52d7ec3efb251..7f26c6369b0e7e0bb76b7d4ade027cf4bacb79b1 100644 (file)
--- a/src/lyxlength.C
+++ b/src/lyxlength.C
@@ -18,7 +18,11 @@
 
 #include "Lsstream.h"
 
+#if defined(__GNUG__) && __GNUC__ == 2 && __GNUC_MINOR__ >= 95
+#include <cstdlib>
+#else
 #include <cmath>
+#endif
 
 namespace {
 // this is now here and in lyxgluelength.C