From 5d629ca37207b04a78ea444e1bd0a96daa7bfaff Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Tue, 14 Dec 2010 18:35:12 -0500
Subject: Not having setlocale(3) is so ten years ago...

---
 gpsdclient.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'gpsdclient.c')

diff --git a/gpsdclient.c b/gpsdclient.c
index 2dd75e63..832a9217 100644
--- a/gpsdclient.c
+++ b/gpsdclient.c
@@ -4,22 +4,19 @@
  * This file is Copyright (c) 2010 by the GPSD project
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
-#ifndef S_SPLINT_S
-#include <unistd.h>
-#endif /* S_SPLINT_S */
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <assert.h>
+#include <locale.h>
+#ifndef S_SPLINT_S
+#include <unistd.h>
+#endif /* S_SPLINT_S */
 
 #include "gpsd_config.h"
 #include "gps.h"
 #include "gpsdclient.h"
 
-#ifdef HAVE_SETLOCALE
-#include <locale.h>
-#endif
-
 /* convert double degrees to a static string and return a pointer to it
  *
  * deg_str_type:
@@ -101,9 +98,7 @@ enum unit gpsd_units(void)
 {
     char *envu = NULL;
 
-#ifdef HAVE_SETLOCALE
     (void)setlocale(LC_NUMERIC, "C");
-#endif
     if ((envu = getenv("GPSD_UNITS")) != NULL && *envu != '\0') {
 	if (0 == strcasecmp(envu, "imperial")) {
 	    return imperial;
-- 
cgit v1.2.1