aboutsummaryrefslogtreecommitdiffstats
path: root/xmlstub.h
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2001-11-02 10:01:00 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2001-11-02 10:01:00 +0000
commit55e1692b8dff5cd982009967e382e76898ecb418 (patch)
treefa5faeded02ee5843d3dff1d79dc45c8b31a2d0e /xmlstub.h
parent9a3d4be55e02bd19c3932cdbb306fddf4a298a97 (diff)
Don't assume that all UNIX platforms have <iconv.h> - explicitly check
whether it's present. This puts HAVE_ICONV_H in the "config.h" file, so put in an entry for it in "config.h.win32" - an entry that doesn't define it - and get rid of the check for WIN32 in "xmlstub.h". git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4124 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'xmlstub.h')
-rw-r--r--xmlstub.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/xmlstub.h b/xmlstub.h
index ee2a856670..99492717d9 100644
--- a/xmlstub.h
+++ b/xmlstub.h
@@ -97,14 +97,12 @@ extern void xmlCheckVersion(int version);
/*
* Whether iconv support is available
*/
-#ifndef WIN32
-#if 1
+#ifdef HAVE_ICONV_H
#define LIBXML_ICONV_ENABLED
#include <iconv.h>
#else
#define LIBXML_ICONV_DISABLED
#endif
-#endif
/*
* Whether Debugging module is configured in