Major overhaul of C/C++ scanner API. Unified tokenizing code so that tokens are scanned by a common code base

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@9639 626c5289-ae23-0410-ae9c-e8d60b6d4f22

Source/Preprocessor/cpp.c

@@ -909,7 +909,10 @@ static String *expand_macro(String *name, List *args) {
 #else
     /* Use simplified around markers to properly count lines in cscanner.c */
     if (strchr(Char(g), '\n')) {
+      Printf(f, "/*@SWIG:%s,%d,%s@*/%s/*@SWIG@*/", Getfile(macro), Getline(macro), name, g);
+#if 0
       Printf(f, "/*@SWIG:%s@*/%s/*@SWIG@*/", name, g);
+#endif
     } else {
       Append(f, g);
     }