[pulseaudio-commits] configure.ac src/pulsecore

[David Henningsson]

 configure.ac              |    1 +
 src/pulsecore/core-util.c |    5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 2d555ba15cc3c795c14962c7d5b5be69ee269a5a
Author: Kamil Rytarowski <n54 at gmx.com>
Date:   Sat Nov 28 10:01:05 2015 +0100

    netbsd: Improve handling of <locale> and <xlocale.h> headers
    
    NetBSD ships with strtod_l(3) in <stdlib.h>.
    Having strtol_l(3) doesn't imply to have <xlocale.h>.
    Generalize inclusion of <locale.h> and <xlocale.h>.

diff --git a/configure.ac b/configure.ac
index abfb8d9..640be09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -447,6 +447,7 @@ AC_CHECK_HEADERS_ONCE([sys/eventfd.h])
 AC_CHECK_HEADERS_ONCE([execinfo.h])
 AC_CHECK_HEADERS_ONCE([langinfo.h])
 AC_CHECK_HEADERS_ONCE([regex.h pcreposix.h])
+AC_CHECK_HEADERS_ONCE([locale.h xlocale.h])
 
 AM_CONDITIONAL(HAVE_SYS_EVENTFD_H, test "x$ac_cv_header_sys_eventfd_h" = "xyes")
 
diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
index b5ddd3d..3d36993 100644
--- a/src/pulsecore/core-util.c
+++ b/src/pulsecore/core-util.c
@@ -53,9 +53,13 @@
 #endif
 
 #ifdef HAVE_STRTOD_L
+#ifdef HAVE_LOCALE_H
 #include <locale.h>
+#endif
+#ifdef HAVE_XLOCALE_H
 #include <xlocale.h>
 #endif
+#endif
 
 #ifdef HAVE_SCHED_H
 #include <sched.h>
@@ -106,7 +110,6 @@
 #endif
 
 #ifdef __APPLE__
-#include <xlocale.h>
 #include <mach/mach_init.h>
 #include <mach/thread_act.h>
 #include <mach/thread_policy.h>