diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2016-07-11 17:23:38 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2016-07-11 17:26:49 +1000 |
| commit | f3f2cc8386868f51440c45210098f65f9787449a (patch) | |
| tree | 48958a7bae719e91fa1a0bafaaaf0475e9ed322f | |
| parent | b9c50614eba9d90939b2b119b6e1b7e03b462278 (diff) | |
| download | openssh-git-f3f2cc8386868f51440c45210098f65f9787449a.tar.gz | |
Check for wchar.h and langinfo.h
Wrap includes in the appropriate #ifdefs.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | utf8.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 9da2b036..2bb5a63c 100644 --- a/configure.ac +++ b/configure.ac @@ -381,6 +381,7 @@ AC_CHECK_HEADERS([ \ ia.h \ iaf.h \ inttypes.h \ + langinfo.h \ limits.h \ locale.h \ login.h \ @@ -433,6 +434,7 @@ AC_CHECK_HEADERS([ \ utmp.h \ utmpx.h \ vis.h \ + wchar.h \ ]) # lastlog.h requires sys/time.h to be included first on Solaris @@ -23,7 +23,9 @@ #include "includes.h" #include <sys/types.h> -#include <langinfo.h> +#ifdef HAVE_LANGINFO_H +# include <langinfo.h> +#endif #include <limits.h> #include <stdarg.h> #include <stdio.h> @@ -32,7 +34,9 @@ #if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) && !defined(BROKEN_STRNVIS) # include <vis.h> #endif -#include <wchar.h> +#ifdef HAVE_WCHAR_H +# include <wchar.h> +#endif #include "utf8.h" |