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

Author: doxygen

src/pre.l

@@ -926,6 +926,9 @@ NUMBER {INTEGER_NUMBER}|{FLOAT_NUMBER}
 <FindDefineArgs>{CPPC}[/!].*\n          { // replace C++ single line style comment by C style comment
                                           yyextra->defArgsStr+=QCString("/**")+&yytext[3]+" */";
                                         }
+<FindDefineArgs>{CPPC}.*\n              { // replace C++ single line style comment by C style comment
+                                          yyextra->defArgsStr+=QCString("/*")+&yytext[2]+" */";
+                                        }
 <FindDefineArgs>\"                      {
                                           yyextra->defArgsStr+=*yytext;
                                           BEGIN(ReadString);