Alexandre Julliard : mlang/tests: Fix some nasty #ifdef syntax.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 71678645ad31a0130eaf92a761967fbcfb949eb7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=71678645ad31a0130eaf92a761...

Author: Alexandre Julliard 
Date:   Sun May 30 20:26:56 2010 +0200

mlang/tests: Fix some nasty #ifdef syntax.

---

dlls/mlang/tests/mlang.c |   37 ++++++++-----------------------------
 1 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c
index 7ab3ff9..2c4e0c1 100644
--- a/dlls/mlang/tests/mlang.c
+++ b/dlls/mlang/tests/mlang.c
@@ -36,14 +36,8 @@
 #define CP_UNICODE 1200
 #endif

-#if 0
-#define DUMP_CP_INFO
-#define DUMP_SCRIPT_INFO
-
-#if defined DUMP_CP_INFO || defined DUMP_SCRIPT_INFO
-#include "wine/debug.h"
-#endif
-#endif /* 0 */
+/* #define DUMP_CP_INFO */
+/* #define DUMP_SCRIPT_INFO */

static BOOL (WINAPI *pGetCPInfoExA)(UINT, DWORD, LPCPINFOEXA);
 static HRESULT (WINAPI *pConvertINetMultiByteToUnicode)(LPDWORD, DWORD, LPCSTR,
@@ -630,13 +624,8 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags)
 #ifdef DUMP_CP_INFO
             trace("%s: %u %u %s\n", wine_dbgstr_w(cpinfo[i].wszWebCharset), mcsi.uiCodePage, mcsi.uiInternetEncoding, wine_dbgstr_w(mcsi.wszCharset));
 #endif
-            ok(!lstrcmpiW(cpinfo[i].wszWebCharset, mcsi.wszCharset),
-#ifdef DUMP_CP_INFO
-                    "%s != %s\n",
-            wine_dbgstr_w(cpinfo[i].wszWebCharset), wine_dbgstr_w(mcsi.wszCharset));
-#else
-                    "wszWebCharset mismatch\n");
-#endif
+            ok(!lstrcmpiW(cpinfo[i].wszWebCharset, mcsi.wszCharset), "%s != %s\n",
+               wine_dbgstr_w(cpinfo[i].wszWebCharset), wine_dbgstr_w(mcsi.wszCharset));

if (0)
         {
@@ -661,13 +650,8 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags)
 #ifdef DUMP_CP_INFO
             trace("%s: %u %u %s\n", wine_dbgstr_w(cpinfo[i].wszHeaderCharset), mcsi.uiCodePage, mcsi.uiInternetEncoding, wine_dbgstr_w(mcsi.wszCharset));
 #endif
-            ok(!lstrcmpiW(cpinfo[i].wszHeaderCharset, mcsi.wszCharset),
-#ifdef DUMP_CP_INFO
-                    "%s != %s\n",
-            wine_dbgstr_w(cpinfo[i].wszHeaderCharset), wine_dbgstr_w(mcsi.wszCharset));
-#else
-                    "wszHeaderCharset mismatch\n");
-#endif
+            ok(!lstrcmpiW(cpinfo[i].wszHeaderCharset, mcsi.wszCharset), "%s != %s\n",
+               wine_dbgstr_w(cpinfo[i].wszHeaderCharset), wine_dbgstr_w(mcsi.wszCharset));

if (0)
         {
@@ -692,13 +676,8 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags)
 #ifdef DUMP_CP_INFO
             trace("%s: %u %u %s\n", wine_dbgstr_w(cpinfo[i].wszBodyCharset), mcsi.uiCodePage, mcsi.uiInternetEncoding, wine_dbgstr_w(mcsi.wszCharset));
 #endif
-            ok(!lstrcmpiW(cpinfo[i].wszBodyCharset, mcsi.wszCharset),
-#ifdef DUMP_CP_INFO
-                    "%s != %s\n",
-            wine_dbgstr_w(cpinfo[i].wszBodyCharset), wine_dbgstr_w(mcsi.wszCharset));
-#else
-                    "wszBodyCharset mismatch\n");
-#endif
+            ok(!lstrcmpiW(cpinfo[i].wszBodyCharset, mcsi.wszCharset), "%s != %s\n",
+               wine_dbgstr_w(cpinfo[i].wszBodyCharset), wine_dbgstr_w(mcsi.wszCharset));

if (0)
         {