issue #7104 Warning with preprocessor

The test on 'defined' has to be done earlier as otherwise the replacement (limited to 2 defined is enough for the test) of
```
(defined(__AVR_ATmega644RFR2__)||defined(__AVR_ATmega256RFR2__))
```
will be
```
` ! (defined( 0 )||0( 0 )) '
```
instead of
```
` ! (defined( 0 )||defined( 0 )) '
```

1 files changed, 6 insertions, 6 deletions

diff --git a/src/pre.l b/src/pre.l
index ca2fe2b..6829a92 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -1089,7 +1089,12 @@ static void expandExpression(QCString &expr,QCString *rest,int pos)
       if (g_expandedDict->find(macroName)==0) // expand macro
       {
 	Define *def=DefineManager::instance().isDefined(macroName);
-	if (definedTest) // macro name was found after defined 
+        if (macroName=="defined")
+        {
+  	  //printf("found defined inside macro definition '%s'\n",expr.right(expr.length()-p).data());
+	  definedTest=TRUE;
+        }
+	else if (definedTest) // macro name was found after defined 
 	{
 	  if (def) expMacro = " 1 "; else expMacro = " 0 ";
 	  replaced=TRUE;
@@ -1118,11 +1123,6 @@ static void expandExpression(QCString &expr,QCString *rest,int pos)
 	  replaced=replaceFunctionMacro(expr,rest,p+l,len,def,expMacro);
 	  len+=l;
 	}
-        else if (macroName=="defined")
-        {
-  	  //printf("found defined inside macro definition '%s'\n",expr.right(expr.length()-p).data());
-	  definedTest=TRUE;
-        }
 
 	if (replaced) // expand the macro and rescan the expression
 	{