diff options
| author |   ragge <ragge@openbsd.org> | 2007-10-07 07:58:51 +0000 |
|---|---|---|
| committer | ragge <ragge@openbsd.org> | 2007-10-07 07:58:51 +0000 |
| commit | 3b01aee1ceddf995e8617e697809819d18b2d3e4 (patch) | |
| tree | 751ce427c1729ed09fc848bc4f9bd5ef48edc547 | |
| parent | Simpliest memset(,0,) -> M_ZERO changes. One (caddr *) cast removal, (diff) | |
| download | wireguard-openbsd-3b01aee1ceddf995e8617e697809819d18b2d3e4.tar.xz wireguard-openbsd-3b01aee1ceddf995e8617e697809819d18b2d3e4.zip | |
From master repo:
> Don't let pragmas pass through if #ifdef'd away, from Stefan Kempf.
| -rw-r--r-- | usr.bin/pcc/cc/cpp/scanner.l | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/usr.bin/pcc/cc/cpp/scanner.l b/usr.bin/pcc/cc/cpp/scanner.l index 5bb0dc51365..94656769f3c 100644 --- a/usr.bin/pcc/cc/cpp/scanner.l +++ b/usr.bin/pcc/cc/cpp/scanner.l @@ -1,5 +1,5 @@ %{ -/* $OpenBSD: scanner.l,v 1.8 2007/09/28 17:59:45 otto Exp $ */ +/* $OpenBSD: scanner.l,v 1.9 2007/10/07 07:58:51 ragge Exp $ */ /* * Copyright (c) 2004 Anders Magnusson. All rights reserved. @@ -804,9 +804,12 @@ pragmastmt(void) slow = 1; if (yylex() != WSPACE) error("bad pragma"); - putstr((usch *)"#pragma "); + if (!flslvl) + putstr((usch *)"#pragma "); do { - putch(c = input()); /* Do arg expansion instead? */ + c = input(); + if (!flslvl) + putch(c); /* Do arg expansion instead? */ } while (c && c != '\n'); ifiles->lineno++; prtline(); |