1 files changed, 18 insertions, 24 deletions
diff --git a/protocols/IcqOscarJ/src/i18n.h b/protocols/IcqOscarJ/src/i18n.h
index 923609c8a2..56533e95f8 100644
--- a/protocols/IcqOscarJ/src/i18n.h
+++ b/protocols/IcqOscarJ/src/i18n.h
@@ -30,37 +30,31 @@
 #ifndef __I18N_H
 #define __I18N_H
 
-BOOL __stdcall IsUSASCII(const char *pBuffer, size_t nSize);
-BOOL __stdcall IsUnicodeAscii(const WCHAR *pBuffer, size_t nSize);
-int  __stdcall UTF8_IsValid(const char *pszInput);
+BOOL   CALLBACK IsUSASCII(const char *pBuffer, size_t nSize);
+BOOL   CALLBACK IsUnicodeAscii(const WCHAR *pBuffer, size_t nSize);
+int    CALLBACK UTF8_IsValid(const char *pszInput);
 
-int __stdcall get_utf8_size(const WCHAR *unicode);
+int    CALLBACK get_utf8_size(const WCHAR *unicode);
 
-char* __stdcall detect_decode_utf8(const char *from);
+char*  CALLBACK detect_decode_utf8(const char *from);
 
-WCHAR* __stdcall make_unicode_string(const char *utf8);
-WCHAR* __stdcall make_unicode_string_static(const char *utf8, WCHAR *unicode, size_t unicode_size);
+WCHAR* CALLBACK make_unicode_string(const char *utf8);
+WCHAR* CALLBACK make_unicode_string_static(const char *utf8, WCHAR *unicode, size_t unicode_size);
 
-char*  __stdcall make_utf8_string(const WCHAR *unicode);
-char*  __stdcall make_utf8_string_static(const WCHAR *unicode, char *utf8, size_t utf_size);
+char*  CALLBACK make_utf8_string(const WCHAR *unicode);
+char*  CALLBACK make_utf8_string_static(const WCHAR *unicode, char *utf8, size_t utf_size);
 
-char*  __stdcall ansi_to_utf8(const char *ansi);
-char*  __stdcall ansi_to_utf8_codepage(const char *ansi, WORD wCp);
+char*  CALLBACK ansi_to_utf8(const char *ansi);
+char*  CALLBACK ansi_to_utf8_codepage(const char *ansi, WORD wCp);
 
-WCHAR* __stdcall ansi_to_unicode(const char *ansi);
-char* __stdcall unicode_to_ansi(const WCHAR *unicode);
-char* __stdcall unicode_to_ansi_static(const WCHAR *unicode, char *ansi, size_t ansi_size);
+WCHAR* CALLBACK ansi_to_unicode(const char *ansi);
+char*  CALLBACK unicode_to_ansi(const WCHAR *unicode);
+char*  CALLBACK unicode_to_ansi_static(const WCHAR *unicode, char *ansi, size_t ansi_size);
 
-int   __stdcall utf8_encode(const char *from, char **to);
-int   __stdcall utf8_decode(const char *from, char **to);
-int   __stdcall utf8_decode_codepage(const char *from, char **to, WORD wCp);
-int   __stdcall utf8_decode_static(const char *from, char *to, size_t to_size);
-
-#define tchar_to_utf8 make_utf8_string
-#define utf8_to_tchar_static make_unicode_string_static
-#define utf8_to_tchar make_unicode_string
-#define ansi_to_tchar ansi_to_unicode
-#define tchar_to_ansi unicode_to_ansi
+int    CALLBACK utf8_encode(const char *from, char **to);
+int    CALLBACK utf8_decode(const char *from, char **to);
+int    CALLBACK utf8_decode_codepage(const char *from, char **to, WORD wCp);
+int    CALLBACK utf8_decode_static(const char *from, char *to, size_t to_size);
 
 void InitI18N(void);