diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-05-13 19:14:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:58 -0500 |
| commit | 172a83d72491f90f6191be1040ef8b2e1789bd2e (patch) | |
| tree | 9407540663c3462c525c36a383b23b61963ceceb /source4/include/system | |
| parent | 53f005f6aaa2aa2eb599e6787e2c700a1d44d2a2 (diff) | |
| download | samba-172a83d72491f90f6191be1040ef8b2e1789bd2e.tar.gz samba-172a83d72491f90f6191be1040ef8b2e1789bd2e.tar.bz2 samba-172a83d72491f90f6191be1040ef8b2e1789bd2e.zip | |
r15573: Fix build of systems that have iconv headers in non-standard locations
Split of system/locale.h header from system/iconv.h
Previously, iconv wasn't being used on these systems
(This used to be commit aa6d66fda69779d1c2948a1aca85dbd5208f1cba)
Diffstat (limited to 'source4/include/system')
| -rw-r--r-- | source4/include/system/config.m4 | 2 | ||||
| -rw-r--r-- | source4/include/system/iconv.h | 8 | ||||
| -rw-r--r-- | source4/include/system/locale.h | 29 |
3 files changed, 30 insertions, 9 deletions
diff --git a/source4/include/system/config.m4 b/source4/include/system/config.m4 index 2c62b571e0..8e7448bbe4 100644 --- a/source4/include/system/config.m4 +++ b/source4/include/system/config.m4 @@ -30,7 +30,7 @@ AC_CHECK_HEADERS(sys/capability.h) # passwd AC_CHECK_HEADERS(grp.h sys/id.h compat.h shadow.h sys/priv.h pwd.h sys/security.h) -# iconv +# locale AC_CHECK_HEADERS(ctype.h locale.h) # glob diff --git a/source4/include/system/iconv.h b/source4/include/system/iconv.h index d9111bb07e..96500dbfac 100644 --- a/source4/include/system/iconv.h +++ b/source4/include/system/iconv.h @@ -27,14 +27,6 @@ #include <giconv.h> #endif -#ifdef HAVE_CTYPE_H -#include <ctype.h> -#endif - -#ifdef HAVE_LOCALE_H -#include <locale.h> -#endif - /* needed for some systems without iconv. Doesn't really matter what error code we use */ #ifndef EILSEQ diff --git a/source4/include/system/locale.h b/source4/include/system/locale.h new file mode 100644 index 0000000000..e4be4a128b --- /dev/null +++ b/source4/include/system/locale.h @@ -0,0 +1,29 @@ +/* + Unix SMB/CIFS implementation. + + locale include wrappers + + Copyright (C) Andrew Tridgell 2004 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#ifdef HAVE_CTYPE_H +#include <ctype.h> +#endif + +#ifdef HAVE_LOCALE_H +#include <locale.h> +#endif |