$OpenBSD: patch-jdk_src_solaris_instrument_EncodingSupport_md_c,v 1.1 2013/02/01 15:34:35 kurt Exp $
--- jdk/src/solaris/instrument/EncodingSupport_md.c.orig	Mon Jan 28 22:27:56 2013
+++ jdk/src/solaris/instrument/EncodingSupport_md.c	Mon Jan 28 22:28:23 2013
@@ -28,10 +28,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <locale.h>
-#ifndef __OpenBSD__
-#define HAVE_NL_LANGINFO
 #include <langinfo.h>
-#endif
 #include <iconv.h>
 
 /* Routines to convert back and forth between Platform Encoding and UTF-8 */
@@ -66,7 +63,6 @@ utfInitialize(void)
     /* Set the locale from the environment */
     (void)setlocale(LC_ALL, "");
 
-#ifdef HAVE_NL_LANGINFO
     /* Get the codeset name */
     codeset = (char*)nl_langinfo(CODESET);
     if ( codeset == NULL || codeset[0] == 0 ) {
@@ -81,9 +77,6 @@ utfInitialize(void)
         UTF_DEBUG(("NO iconv() being used because it is not needed\n"));
         return;
     }
-#else
-    codeset = "ISO-8859-1";
-#endif
 
     /* Open conversion descriptors */
     iconvToPlatform   = iconv_open(codeset, "UTF-8");
