aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
authorwelinder@troll.com <welinder@troll.com>2004-10-06 11:46:37 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-07 21:03:31 -0700
commit3bc7425b7a1e6bbc4890a42266d8a568074e83fc (patch)
treeb18b41d022142a18176b83c3358c08737677a72a
parent90277b7cb7b067011e7f7c49b2db1a7f123454e2 (diff)
parentbcb8e17ecdb2b04e9e7d47f8c16386ed3563f426 (diff)
downloadsparse-dev-3bc7425b7a1e6bbc4890a42266d8a568074e83fc.tar.gz
Merge troll.com:/scratch/welinder/linus-sparse
into troll.com:/scratch/welinder/janitorial
-rw-r--r--lib.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib.c b/lib.c
index bd5ed55c..aa059c37 100644
--- a/lib.c
+++ b/lib.c
@@ -775,5 +775,10 @@ void create_builtin_stream(void)
add_pre_buffer("#define __builtin_stdarg_start(a,b) ((a) = (__builtin_va_list)(&(b)))\n");
add_pre_buffer("#define __builtin_va_start(a,b) ((a) = (__builtin_va_list)(&(b)))\n");
add_pre_buffer("#define __builtin_va_arg(arg,type) ((type)0)\n");
- add_pre_buffer("#define __builtin_va_end(arg)\n");
+ add_pre_buffer("#define __builtin_va_end(arg)\n");
+ // These live somewhere between parse-land (they need to know the
+ // function name) and pre-processor-land (they concatenate with
+ // strings). Punt.
+ add_pre_buffer("#define __FUNCTION__ \"function\"\n");
+ add_pre_buffer("#define __PRETTY_FUNCTION__ \"function\"\n");
}