diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-16 14:51:46 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-16 14:51:46 +0000 |
| commit | 8617d7e00546f892c9084f7c382648b23d8bbb63 (patch) | |
| tree | 2be51254236644b678418c1147f223a30e030bda /protocols | |
| parent | 05c989e58aeffcfb59cebaca6797cb69dd25cb1e (diff) | |
another portion of "#ifdef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@447 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/YAMN/debug.h | 12 | ||||
| -rw-r--r-- | protocols/YAMN/proto/pop3/pop3opt.h | 8 | ||||
| -rw-r--r-- | protocols/YAMN/yamn.h | 12 |
3 files changed, 8 insertions, 24 deletions
diff --git a/protocols/YAMN/debug.h b/protocols/YAMN/debug.h index d2b6764406..3bde9ddc81 100644 --- a/protocols/YAMN/debug.h +++ b/protocols/YAMN/debug.h @@ -48,18 +48,14 @@ extern HANDLE DecodeFile; #if defined(DEBUG_FILEREAD) || defined(DEBUG_FILEREADMESSAGES)
DWORD ReadStringFromMemory(char **Parser,char *End,char **StoreTo,char *DebugString);
- #ifndef UNICODE
-#define ReadStringFromMemoryW ReadStringFromMemory
- #else
+
DWORD ReadStringFromMemoryW(char **Parser,TCHAR *End,char **StoreTo,TCHAR *DebugString);
- #endif
+
#else
DWORD ReadStringFromMemory(char **Parser,char *End,char **StoreTo);
- #ifndef UNICODE
-#define ReadStringFromMemoryW ReadStringFromMemory
- #else
+
DWORD ReadStringFromMemoryW(WCHAR **Parser,WCHAR *End,WCHAR **StoreTo);
- #endif
+
#endif
//#ifdef DEBUG_ACCOUNTS
diff --git a/protocols/YAMN/proto/pop3/pop3opt.h b/protocols/YAMN/proto/pop3/pop3opt.h index c828c221e0..f3e1afa021 100644 --- a/protocols/YAMN/proto/pop3/pop3opt.h +++ b/protocols/YAMN/proto/pop3/pop3opt.h @@ -33,10 +33,8 @@ int POP3OptInit(WPARAM wParam,LPARAM lParam); BOOL DlgSetItemText(HWND hDlg,WPARAM wParam,const char*);
BOOL DlgSetItemTextW(HWND hDlg,WPARAM wParam,const WCHAR*);
-#if defined( _UNICODE )
- #define DlgSetItemTextT DlgSetItemTextW
-#else
- #define DlgSetItemTextT DlgSetItemText
-#endif
+
+#define DlgSetItemTextT DlgSetItemTextW
+
#endif
diff --git a/protocols/YAMN/yamn.h b/protocols/YAMN/yamn.h index 3a7a7f86f0..4bb8d149e4 100644 --- a/protocols/YAMN/yamn.h +++ b/protocols/YAMN/yamn.h @@ -103,23 +103,13 @@ DWORD FileToMemory(TCHAR *FileName,char **MemFile,char **End); DWORD ReadStringFromMemory(char **Parser,char *End,char **StoreTo,char *DebugString);
#endif
DWORD ReadStringFromMemory(char **Parser,char *End,char **StoreTo);
-#ifndef UNICODE
- #if defined(DEBUG_FILEREAD) || defined(DEBUG_FILEREADMESSAGES)
-DWORD ReadStringFromMemoryW(WCHAR **Parser,WCHAR *End,WCHAR **StoreTo,WCHAR *DebugString);
- #endif //if defined(DEBUG...)
-DWORD ReadStringFromMemoryW(WCHAR **Parser,WCHAR *End,WCHAR **StoreTo);
-#endif //ifdef Unicode
-
DWORD ReadMessagesFromMemory(HACCOUNT Which,char **Parser,char *End);
DWORD ReadAccountFromMemory(HACCOUNT Which,char **Parser,TCHAR *End);
INT_PTR AddAccountsFromFileSvc(WPARAM wParam,LPARAM lParam);
DWORD WriteStringToFile(HANDLE File,char *Source);
-#ifndef UNICODE
-#define WriteStringToFileW WriteStringToFile
-#else
DWORD WriteStringToFileW(HANDLE File,WCHAR *Source);
-#endif
+
DWORD WriteMessagesToFile(HANDLE File,HACCOUNT Which);
DWORD WINAPI WritePOP3Accounts();
|