$OpenBSD: patch-common_charset_traits_h,v 1.3 2015/11/02 11:06:34 robert Exp $
--- common/charset/traits.h.orig	Thu Aug 20 12:49:17 2015
+++ common/charset/traits.h	Thu Aug 20 12:49:32 2015
@@ -102,31 +102,31 @@ class iconv_charset<const char *> _final { (public)
 	}
 };
 
-template <size_t _N>
-class iconv_charset<char[_N]> _final {
+template <size_t _ZCPN>
+class iconv_charset<char[_ZCPN]> _final {
 public:
 	static const char *name() {
 		return CHARSET_CHAR;	// Current locale
 	}
-	static const char *rawptr(const char (&from) [_N]) {
+	static const char *rawptr(const char (&from) [_ZCPN]) {
 		return from;
 	}
-	static size_t rawsize(const char (&) [_N]) {
-		return _N - 1;
+	static size_t rawsize(const char (&) [_ZCPN]) {
+		return _ZCPN - 1;
 	}
 };
 
-template <size_t _N>
-class iconv_charset<const char[_N]> _final {
+template <size_t _ZCPN>
+class iconv_charset<const char[_ZCPN]> _final {
 public:
 	static const char *name() {
 		return CHARSET_CHAR;	// Current locale
 	}
-	static const char *rawptr(const char (&from) [_N]) {
+	static const char *rawptr(const char (&from) [_ZCPN]) {
 		return from;
 	}
-	static size_t rawsize(const char (&) [_N]) {
-		return _N - 1;
+	static size_t rawsize(const char (&) [_ZCPN]) {
+		return _ZCPN - 1;
 	}
 };
 
@@ -174,31 +174,31 @@ class iconv_charset<const wchar_t *> _final { (public)
 	}
 };
 
-template <size_t _N>
-class iconv_charset<wchar_t[_N]> _final {
+template <size_t _ZCPN>
+class iconv_charset<wchar_t[_ZCPN]> _final {
 public:
 	static const char *name() {
 		return CHARSET_WCHAR;	// Current locale
 	}
-	static const char *rawptr(const wchar_t (&from) [_N]) {
+	static const char *rawptr(const wchar_t (&from) [_ZCPN]) {
 		return reinterpret_cast<const char*>(from);
 	}
-	static size_t rawsize(const wchar_t (&) [_N]) {
-		return (_N - 1) * sizeof(wchar_t);
+	static size_t rawsize(const wchar_t (&) [_ZCPN]) {
+		return (_ZCPN - 1) * sizeof(wchar_t);
 	}
 };
 
-template <size_t _N>
-class iconv_charset<const wchar_t[_N]> _final {
+template <size_t _ZCPN>
+class iconv_charset<const wchar_t[_ZCPN]> _final {
 public:
 	static const char *name() {
 		return CHARSET_WCHAR;	// Current locale
 	}
-	static const char *rawptr(const wchar_t (&from) [_N]) {
+	static const char *rawptr(const wchar_t (&from) [_ZCPN]) {
 		return reinterpret_cast<const char*>(from);
 	}
-	static size_t rawsize(const wchar_t (&) [_N]) {
-		return (_N - 1) * sizeof(wchar_t);
+	static size_t rawsize(const wchar_t (&) [_ZCPN]) {
+		return (_ZCPN - 1) * sizeof(wchar_t);
 	}
 };
 
