[pulseaudio-discuss] [PATCH] netbsd: Improve handling of <locale> and <xlocale.h> headers

[David Henningsson]

Applied, thanks.

Btw, when you make a new patch that supersedes another, you can use "git 
send-email"'s -v2 (and -v3 etc) flag to change the subject from [PATCH] 
to [PATCH v2]. Doing so helps both us and patchwork to track that the 
old patch is superseded.

On 2015-11-28 10:01, Kamil Rytarowski wrote:
> 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>.
> ---
>   configure.ac              | 1 +
>   src/pulsecore/core-util.c | 5 ++++-
>   2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/configure.ac b/configure.ac
> index 003673e..5b3ce7d 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 2099686..ee74280 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>
>

-- 
David Henningsson, Canonical Ltd.
https://launchpad.net/~diwic