diff main.c @ 178:0d5b9651b240

Merge Joerg's changes into upstream. (now that they've been thrashed out a bit, include CHANGES entries, etc.)
author David A. Holland
date Fri, 12 Jun 2015 03:05:49 -0400
parents 3e7e696fe558
children 44ea61019069
line wrap: on
line diff
--- a/main.c	Fri Jun 12 03:04:48 2015 -0400
+++ b/main.c	Fri Jun 12 03:05:49 2015 -0400
@@ -195,6 +195,16 @@
 
 static
 void
+apply_magic_macro(unsigned num, const char *name)
+{
+	struct place p;
+
+	place_setbuiltin(&p, num);
+	macro_define_magic(&p, name);
+}
+
+static
+void
 apply_builtin_macro(unsigned num, const char *name, const char *val)
 {
 	struct place p;
@@ -209,6 +219,9 @@
 {
 	unsigned n = 1;
 
+	apply_magic_macro(n++, "__FILE__");
+	apply_magic_macro(n++, "__LINE__");
+
 #ifdef CONFIG_OS
 	apply_builtin_macro(n++, CONFIG_OS, "1");
 #endif