Updating changelog.

[pkg-rrdtool.git] / src / rrd_dump.c

diff --git a/src/rrd_dump.c b/src/rrd_dump.c
index 57bd0b8d278f431b78bcbfabc7f122aff84e095e..560d1a9080f751203e4e3a9acca58735e1748573 100644 (file)
--- a/src/rrd_dump.c
+++ b/src/rrd_dump.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
- * RRDtool 1.3.2  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.4.7  Copyright by Tobi Oetiker, 1997-2012
  *****************************************************************************
  * rrd_dump  Display a RRD
  *****************************************************************************
- * $Id$
+ * $Id: rrd_dump.c 2267 2012-01-24 10:08:48Z oetiker $
  * $Log$
  * Revision 1.7  2004/05/25 20:53:21  oetiker
  * prevent small leak when resources are exhausted -- Mike Slifcak
@@ -45,9 +45,7 @@
 #include "rrd_rpncalc.h"
 #include "rrd_client.h"
 
-#ifdef HAVE_LOCALE_H
 #include <locale.h>
-#endif
 
 #if !(defined(NETWARE) || defined(WIN32))
 extern char *tzname[2];
@@ -105,9 +103,9 @@ int rrd_dump_cb_r(
         return (-1);
     }
 
-#ifdef HAVE_SETLOCALE
-    old_locale = setlocale(LC_NUMERIC, "C");
-#endif
+    old_locale = setlocale(LC_NUMERIC, NULL);
+    setlocale(LC_NUMERIC, "C");
+
 
     if (opt_header == 1) {
         CB_PUTS("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
@@ -451,9 +449,7 @@ int rrd_dump_cb_r(
 
     rrd_free(&rrd);
 
-#ifdef HAVE_SETLOCALE
     setlocale(LC_NUMERIC, old_locale);
-#endif
 
     return rrd_close(rrd_file);