I committed this patch to the gcc-in-cxx branch to fix builtins.c for
C++.

Ian


2008-07-01  Ian Lance Taylor  <iant@google.com>

	* builtins.c (expand_builtin_profile_func): Rename local variable
	this to this_func.
	(validate_arglist): Pass int rather than enum to va_arg.