Adjust debug output for fonts

[lyx.git] / src / support / lyxlib.h

diff --git a/src/support/lyxlib.h b/src/support/lyxlib.h
index ba784361963d4991dc9b720151b945bf760507f9..23894ee2ebea1d47d077ca3344ada70edd32e89f 100644 (file)
--- a/src/support/lyxlib.h
+++ b/src/support/lyxlib.h
@@ -7,7 +7,7 @@
  * A selection of useful system functions made
  * handy for C++ usage.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -15,17 +15,25 @@
 #ifndef LYX_LIB_H
 #define LYX_LIB_H
 
-#include <string>
+// always include <math.h> (also with MSVC), to avoid compiler specific side effects
+#include <math.h>
 
+#ifdef _MSC_VER
+/// Replacement for C99 round()
+inline double round(double x)
+{
+       if (x < 0)
+               return ceil(x - 0.5);
+       else
+               return floor(x + 0.5);
+}
+#endif
 
 namespace lyx {
 namespace support {
 
 /// FIXME: some point to this hmm ?
 int kill(int pid, int sig);
-/// FIXME: same here
-void abort();
-
 
 /**
  * Returns true if var is approximately equal to number with allowed error
@@ -40,6 +48,12 @@ inline bool float_equal(double var, double number, double error)
        return (number - error <= var && var <= number + error);
 }
 
+/// round \p x to nearest integer
+inline int iround(double x)
+{
+       return static_cast<int>(round(x));
+}
+
 } // namespace support
 } // namespace lyx