--- Merging r19369 into '.':

C    rtl/unix/cwstring.pp
Summary of conflicts:
  Text conflicts: 1

# revisions: 19369
------------------------------------------------------------------------
r19369 | pierre | 2011-10-05 00:20:41 +0200 (Wed, 05 Oct 2011) | 1 line
Changed paths:
   M /trunk/rtl/unix/cwstring.pp

 + Added OpenBSD CODESET and LC_ALL values
------------------------------------------------------------------------

git-svn-id: branches/fixes_2_6@21012 -

rtl/unix/cwstring.pp

@@ -105,8 +105,13 @@ const
   {$endif}
   ESysEILSEQ = EILSEQ;
 {$else}
+{$ifdef OpenBSD}
+  CODESET = 51;
+  LC_ALL = 0;
+{$else not OpenBSD}
 {$error lookup the value of CODESET in /usr/include/langinfo.h, and the value of LC_ALL in /usr/include/locale.h for your OS }
 // and while doing it, check if iconv is in libc, and if the symbols are prefixed with iconv_ or libiconv_
+{$endif OpenBSD}
 {$endif beos}
 {$endif solaris}
 {$endif FreeBSD}