$OpenBSD: patch-src_af_util_xp_ut_iconv_cpp,v 1.1 2009/10/10 09:51:52 ajacoutot Exp $
--- src/af/util/xp/ut_iconv.cpp.orig	Sun Apr  6 17:32:28 2008
+++ src/af/util/xp/ut_iconv.cpp	Sat Oct 10 10:44:51 2009
@@ -239,10 +239,10 @@ const char * ucs2Internal ()
   // we special-case the win32 build, otherwise spelling and other stuff
   // just doesn't work
   return "UCS-2LE";
-#elif defined(_LIBICONV_H)
+#elif defined(_LIBICONV_H) || defined(__OpenBSD__)
   // libiconv seems to prefer UCS-2-INTERNAL to UCS-2BE and UCS-2LE
   return "UCS-2-INTERNAL";
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__QNXNTO__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__QNXNTO__) || defined(__NetBSD__)
   // we special case the BSDs since spelling just doesn't work
   return "UCS2";
 #else
@@ -262,10 +262,10 @@ const char * ucs4Internal ()
   // we special-case the win32 build, otherwise spelling and other stuff
   // just doesn't work
   return "UCS-4LE";
-#elif defined(_LIBICONV_H)
+#elif defined(_LIBICONV_H) || defined(__OpenBSD__)
   // libiconv seems to prefer UCS-4-INTERNAL to UCS-4BE and UCS-4LE
   return "UCS-4-INTERNAL";
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__)
   // we special case the BSDs since spelling just doesn't work
   return "UCS4";
 #else
