Index: ext/libicpf/src/gen_types.h
===================================================================
diff -u -N -re17c80d36eaa0430313e7d1058aa7a301d1510af -r7871106ff37289319d30704b0fb2d9ce4d3ee2c9
--- ext/libicpf/src/gen_types.h	(.../gen_types.h)	(revision e17c80d36eaa0430313e7d1058aa7a301d1510af)
+++ ext/libicpf/src/gen_types.h	(.../gen_types.h)	(revision 7871106ff37289319d30704b0fb2d9ce4d3ee2c9)
@@ -190,6 +190,21 @@
 /// 8bit unsigned char
 typedef unsigned char	uchar_t;
 
+// system/configuration dependent chars
+#if (defined(_WIN32) || defined(_WIN64)) && defined(_UNICODE)
+	/// System/configuration dependent character (either wide char or normal one)
+	typedef wchar_t		tchar_t;
+	/// Macro to be appended to each text in code to be either composed of wide characters or normal ones
+	#define _t(text)	L(text)
+	/// String formatting string - depending on configuration could display wide char string or normal one.
+	#define TSTRFMT		WSTRFMT
+#else
+	// description as above
+	typedef char_t		tchar_t;
+	#define _t(text)	text
+	#define TSTRFMT		STRFMT
+#endif
+
 // 16-bit integers
 /// 16bit short integer
 typedef short			short_t;