From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 9 Jun 2009 20:12:55 +0000 (+0200)
Subject: Avoid #if inside macro expansion
X-Git-Tag: v3.0.47~5
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=ae1c6f1a0a5fb745b1a5fa315869161d7480c6f7;p=yaz-moved-to-github.git

Avoid #if inside macro expansion
---

diff --git a/test/tstccl.c b/test/tstccl.c
index f985890..6455d70 100644
--- a/test/tstccl.c
+++ b/test/tstccl.c
@@ -218,15 +218,17 @@ void tst1(int pass)
                             "@attr 5=1 @attr 4=2 @attr 1=1016 b "));
 
     /* Bug #2895 */
-    YAZ_CHECK(tst_ccl_query(bibset, "a? b?", 
 #if 1
+    YAZ_CHECK(tst_ccl_query(bibset, "a? b?", 
                             /* incorrect. */
                             "@and @attr 4=2 @attr 1=1016 a? "
+                            "@attr 5=1 @attr 4=2 @attr 1=1016 b "));
 #else
+    YAZ_CHECK(tst_ccl_query(bibset, "a? b?", 
                             /* correct */
                             "@and @attr 5=1 @attr 4=2 @attr 1=1016 a "
-#endif
                             "@attr 5=1 @attr 4=2 @attr 1=1016 b "));
+#endif
     ccl_qual_rm(&bibset);
 }