Mercurial > ~dholland > hg > tradcpp > index.cgi
comparison 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 |
comparison
equal
deleted
inserted
replaced
156:e8f7ae63844f | 178:0d5b9651b240 |
---|---|
193 array_setsize(&commandline_macros, 0); | 193 array_setsize(&commandline_macros, 0); |
194 } | 194 } |
195 | 195 |
196 static | 196 static |
197 void | 197 void |
198 apply_magic_macro(unsigned num, const char *name) | |
199 { | |
200 struct place p; | |
201 | |
202 place_setbuiltin(&p, num); | |
203 macro_define_magic(&p, name); | |
204 } | |
205 | |
206 static | |
207 void | |
198 apply_builtin_macro(unsigned num, const char *name, const char *val) | 208 apply_builtin_macro(unsigned num, const char *name, const char *val) |
199 { | 209 { |
200 struct place p; | 210 struct place p; |
201 | 211 |
202 place_setbuiltin(&p, num); | 212 place_setbuiltin(&p, num); |
206 static | 216 static |
207 void | 217 void |
208 apply_builtin_macros(void) | 218 apply_builtin_macros(void) |
209 { | 219 { |
210 unsigned n = 1; | 220 unsigned n = 1; |
221 | |
222 apply_magic_macro(n++, "__FILE__"); | |
223 apply_magic_macro(n++, "__LINE__"); | |
211 | 224 |
212 #ifdef CONFIG_OS | 225 #ifdef CONFIG_OS |
213 apply_builtin_macro(n++, CONFIG_OS, "1"); | 226 apply_builtin_macro(n++, CONFIG_OS, "1"); |
214 #endif | 227 #endif |
215 #ifdef CONFIG_OS_2 | 228 #ifdef CONFIG_OS_2 |