Merge branch 'master' of github.com:doxygen/doxygen

Author: doxygen

src/pre.l

@@ -1926,6 +1926,7 @@ WSopt [ \t\r]*
                                             }
                                             else
                                             {
+                                              if (def->fileName != yyextra->fileName) addDefine(yyscanner);
                                               //printf("error: define %s is defined more than once!\n",qPrint(yyextra->defName));
                                             }
                                           }