small changes read changelog

[lyx.git] / src / support / fmt.C

diff --git a/src/support/fmt.C b/src/support/fmt.C
index d7b4897e0829fcfa3169732659305da3aeadc2f7..cc66835ba234603aa6d2bb62f8f7c9cce026a8be 100644 (file)
--- a/src/support/fmt.C
+++ b/src/support/fmt.C
@@ -2,12 +2,16 @@
 #include <cstdio>
 #include <cstdarg>
 
-#ifndef HAVE_VSNPRINTF
+#ifndef HAVE_DECL_VSNPRINTF
 #include "support/snprintf.h"
 #endif
 
 #include "LString.h"
 
+#ifndef CXX_GLOBAL_CSTD
+using std::va_list;
+#endif
+
 /* This output manipulator gives the option to use Old style format
    specifications in ostreams. Note that this is done at the expense
    of typesafety, so if possible this manipulator should be avoided.
@@ -33,7 +37,7 @@ string fmt(char const * fmtstr ...)
        va_list ap;
        while (true) {
                va_start(ap, fmtstr);
-               int const r = ::vsnprintf(str, size, fmtstr, ap);
+               int const r = vsnprintf(str, size, fmtstr, ap);
                va_end(ap);
                if (r == -1) { // size is too small
                        delete [] str;