check sizeof(wchar_t)

gframe/bufferio.h

@@ -74,21 +74,21 @@ public:
 				str[2] = ((*wsrc) & 0x3f) | 0x80;
 				str += 3;
 			} else {
-#ifdef _WIN32
-				unsigned unicode = 0;
-				unicode |= (*wsrc++ & 0x3ff) << 10;
-				unicode |= *wsrc & 0x3ff;
-				unicode += 0x10000;
-				str[0] = ((unicode >> 18) & 0x7) | 0xf0;
-				str[1] = ((unicode >> 12) & 0x3f) | 0x80;
-				str[2] = ((unicode >> 6) & 0x3f) | 0x80;
-				str[3] = ((unicode) & 0x3f) | 0x80;
-#else
-				str[0] = ((*wsrc >> 18) & 0x7) | 0xf0;
-				str[1] = ((*wsrc >> 12) & 0x3f) | 0x80;
-				str[2] = ((*wsrc >> 6) & 0x3f) | 0x80;
-				str[3] = ((*wsrc) & 0x3f) | 0x80;
-#endif // _WIN32
+				if (sizeof(wchar_t) == 2) {
+					unsigned unicode = 0;
+					unicode |= (*wsrc++ & 0x3ff) << 10;
+					unicode |= *wsrc & 0x3ff;
+					unicode += 0x10000;
+					str[0] = ((unicode >> 18) & 0x7) | 0xf0;
+					str[1] = ((unicode >> 12) & 0x3f) | 0x80;
+					str[2] = ((unicode >> 6) & 0x3f) | 0x80;
+					str[3] = ((unicode) & 0x3f) | 0x80;
+				} else {
+					str[0] = ((*wsrc >> 18) & 0x7) | 0xf0;
+					str[1] = ((*wsrc >> 12) & 0x3f) | 0x80;
+					str[2] = ((*wsrc >> 6) & 0x3f) | 0x80;
+					str[3] = ((*wsrc) & 0x3f) | 0x80;
+				}
 				str += 4;
 			}
 			wsrc++;
@@ -111,14 +111,14 @@ public:
 				*wp = (((unsigned)p[0] & 0xf) << 12) | (((unsigned)p[1] & 0x3f) << 6) | ((unsigned)p[2] & 0x3f);
 				p += 3;
 			} else if((*p & 0xf8) == 0xf0) {
-#ifdef _WIN32
-				unsigned unicode = (((unsigned)p[0] & 0x7) << 18) | (((unsigned)p[1] & 0x3f) << 12) | (((unsigned)p[2] & 0x3f) << 6) | ((unsigned)p[3] & 0x3f);
-				unicode -= 0x10000;
-				*wp++ = (unicode >> 10) | 0xd800;
-				*wp = (unicode & 0x3ff) | 0xdc00;
-#else
-				*wp = (((unsigned)p[0] & 0x7) << 18) | (((unsigned)p[1] & 0x3f) << 12) | (((unsigned)p[2] & 0x3f) << 6) | ((unsigned)p[3] & 0x3f);
-#endif // _WIN32
+				if (sizeof(wchar_t) == 2) {
+					unsigned unicode = (((unsigned)p[0] & 0x7) << 18) | (((unsigned)p[1] & 0x3f) << 12) | (((unsigned)p[2] & 0x3f) << 6) | ((unsigned)p[3] & 0x3f);
+					unicode -= 0x10000;
+					*wp++ = (unicode >> 10) | 0xd800;
+					*wp = (unicode & 0x3ff) | 0xdc00;
+				} else {
+					*wp = (((unsigned)p[0] & 0x7) << 18) | (((unsigned)p[1] & 0x3f) << 12) | (((unsigned)p[2] & 0x3f) << 6) | ((unsigned)p[3] & 0x3f);
+				}
 				p += 4;
 			} else
 				p++;