mirror of
https://github.com/samba-team/samba.git
synced 2025-01-15 23:24:37 +03:00
r19121: try to get rid of the difference between in system/iconv.h
between samba 3 and 4. metze (This used to be commit 04031a9fca037ad77cca0ba0da6801d5017521ba)
This commit is contained in:
parent
a856a88ba4
commit
1b80624c57
@ -22,17 +22,27 @@
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#if !defined(HAVE_ICONV) && defined(HAVE_ICONV_H)
|
||||
#define HAVE_ICONV
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_GICONV) && defined(HAVE_GICONV_H)
|
||||
#define HAVE_GICONV
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_BICONV) && defined(HAVE_BICONV_H)
|
||||
#define HAVE_BICONV
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_NATIVE_ICONV
|
||||
#ifdef HAVE_ICONV
|
||||
#if defined(HAVE_ICONV)
|
||||
#include <iconv.h>
|
||||
#endif
|
||||
#ifdef HAVE_GICONV
|
||||
#elif defined(HAVE_GICONV)
|
||||
#include <giconv.h>
|
||||
#endif
|
||||
#ifdef HAVE_BICONV
|
||||
#elif defined(HAVE_BICONV)
|
||||
#include <biconv.h>
|
||||
#endif
|
||||
#endif
|
||||
#endif /* HAVE_NATIVE_ICONV */
|
||||
|
||||
/* needed for some systems without iconv. Doesn't really matter
|
||||
what error code we use */
|
||||
|
Loading…
x
Reference in New Issue
Block a user