--- xapian-core-1.3.1/queryparser/queryparser_internal.cc +++ xapian-core-1.3.1/queryparser/queryparser_internal.cc @@ -1719,10 +1719,10 @@ } // Helper macro for converting a boolean operation into a Xapian::Query. -#define BOOL_OP_TO_QUERY(E, A, OP, B, OP_TXT) \ +#define BOOL_OP_TO_QUERY(E, A, OP, B, OPTXT) \ do {\ if (!A || !B) {\ - state->error = "Syntax: "OP_TXT" ";\ + state->error = "Syntax: " OPTXT " ";\ yy_parse_failed(yypParser);\ return;\ }\ --- xapian-core-1.3.1/queryparser/queryparser.lemony +++ xapian-core-1.3.1/queryparser/queryparser.lemony @@ -1710,10 +1710,10 @@ } // Helper macro for converting a boolean operation into a Xapian::Query. -#define BOOL_OP_TO_QUERY(E, A, OP, B, OP_TXT) \ +#define BOOL_OP_TO_QUERY(E, A, OP, B, OPTXT) \ do {\ if (!A || !B) {\ - state->error = "Syntax: "OP_TXT" ";\ + state->error = "Syntax: " OPTXT " ";\ yy_parse_failed(yypParser);\ return;\ }\