- Normalize the 'Swig_error' calls and formats, before some

of the strings start like "Error. XXX", others like "XXX".
  The format is now defined in 'error.c:Swig_error_msg_format()'.

- Normalize the multiline error/warning messages to correctly
  use -Fformat definition.

- Centralize the error/warning format definitions in
  'error.c:Swig_error_msg_format()'.

- Fix a minor error in cpp.c, that after finding an error, still
  was emitting a redefined macro, producing duplicated error/warning
  messages in parser.y.


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

Source/Modules/typepass.cxx

@@ -405,8 +405,12 @@ public:
 	    SwigType_typedef_class(fname);
 	    scopename = Copy(fname);
 	  } else {
-	    Swig_warning(WARN_TYPE_REDEFINED,Getfile(n),Getline(n),"Template '%s' was already wrapped as '%s' at %s:%d.\n",
-			 SwigType_namestr(name), SwigType_namestr(Getattr(cn,"name")), Getfile(cn), Getline(cn));
+	    Swig_warning(WARN_TYPE_REDEFINED,Getfile(n),Getline(n),
+			 "Template '%s' was already wrapped,\n",
+			 SwigType_namestr(name));
+	    Swig_warning(WARN_TYPE_REDEFINED,Getfile(cn), Getline(cn),
+			 "previous wrap of '%s'.\n",
+			 SwigType_namestr(Getattr(cn,"name")));
 	    scopename = 0;
 	  }
 	} else {