another portion of "#ifsef Unicode" removal

git-svn-id: http://svn.miranda-ng.org/main/trunk@411 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 3 insertions, 10 deletions

diff --git a/protocols/JabberG/jabber.h b/protocols/JabberG/jabber.h
index fd4e8a77b1..d3b13bf447 100644
--- a/protocols/JabberG/jabber.h
+++ b/protocols/JabberG/jabber.h
@@ -656,9 +656,7 @@ void  __stdcall replaceStr( char*& dest, const char* src );
 void  __stdcall replaceStr( WCHAR*& dest, const WCHAR* src );

 int lstrcmp_null(const TCHAR *s1, const TCHAR *s2);

 char* __stdcall rtrim( char *string );

-#if defined( _UNICODE )

-	TCHAR* __stdcall rtrim( TCHAR *string );

-#endif

+TCHAR* __stdcall rtrim( TCHAR *string );

 

 //---- jabber_menu.c ------------------------------------------------

 

@@ -762,13 +760,8 @@ TCHAR*        __stdcall JabberStripJid( const TCHAR* jid, TCHAR* dest, size_t de
 int           __stdcall JabberGetPictureType( const char* buf );

 int           __stdcall JabberGetPacketID( HXML n );

 

-#if defined( _UNICODE )

-	#define JabberUnixToDosT JabberUnixToDosW

-	#define JabberBase64DecodeT JabberBase64DecodeW

-#else

-	#define JabberUnixToDosT JabberUnixToDos

-	#define JabberBase64DecodeT JabberBase64Decode

-#endif

+#define JabberUnixToDosT JabberUnixToDosW

+#define JabberBase64DecodeT JabberBase64DecodeW

 

 const TCHAR *JabberStrIStr( const TCHAR *str, const TCHAR *substr);

 void JabberCopyText(HWND hwnd, TCHAR *text);