Showing the changes to sys/src/cmd/cpp/cpp.c (1 of 11749 files). Show all
Unified · Split
| @@ -16,7 +16,7 @@ int ifdepth; · 15 unmodified lines | ||
| 16 | 16 | int ifsatisfied[NIF]; |
| 17 | 17 | int skipping; |
| 18 | 18 | |
| 19 | −void | |
| 19 | +int | |
| 20 | 20 | main(int argc, char **argv) |
| 21 | 21 | { |
| 22 | 22 | Tokenrow tr; |
| @@ -36,6 +36,7 @@ main(int argc, char **argv) · 13 unmodified lines | ||
| 36 | 36 | flushout(); |
| 37 | 37 | fflush(stderr); |
| 38 | 38 | exits(nerrs? "errors" : 0); |
| 39 | + return 0; | |
| 39 | 40 | } |
| 40 | 41 | |
| 41 | 42 | void |
| @@ -266,12 +267,13 @@ error(enum errtype type, char *string, ...) · 224 unmodified lines | ||
| 266 | 267 | char *cp, *ep; |
| 267 | 268 | Token *tp; |
| 268 | 269 | Tokenrow *trp; |
| 270 | + Source *s; | |
| 269 | 271 | int i; |
| 270 | 272 | |
| 271 | − if (*cursource->filename) | |
| 272 | − fprintf(stderr, "cpp: %s:%d: ", cursource->filename, cursource->line); | |
| 273 | − else | |
| 274 | − fprintf(stderr, "cpp: "); | |
| 273 | + fprintf(stderr, "cpp: "); | |
| 274 | + for (s=cursource; s; s=s->next) | |
| 275 | + if (*s->filename) | |
| 276 | + fprintf(stderr, "%s:%d ", s->filename, s->line); | |
| 275 | 277 | va_start(ap, string); |
| 276 | 278 | for (ep=string; *ep; ep++) { |
| 277 | 279 | if (*ep=='%') { |