[git commit] awk: fix define name collision with BSD headers
Denys Vlasenko
vda.linux at googlemail.com
Sat Sep 10 02:51:09 UTC 2011
commit: http://git.busybox.net/busybox/commit/?id=202a1b9284fd763e81340050d228103aef999675
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
editors/awk.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/editors/awk.c b/editors/awk.c
index 0918026..8117cab 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -238,6 +238,9 @@ typedef struct tsplitter_s {
* For builtins it has different meaning: n n s3 s2 s1 v3 v2 v1,
* n - min. number of args, vN - resolve Nth arg to var, sN - resolve to string
*/
+#undef P
+#undef PRIMASK
+#undef PRIMASK2
#define P(x) (x << 24)
#define PRIMASK 0x7F000000
#define PRIMASK2 0x7E000000
--
1.7.3.4
More information about the busybox-cvs
mailing list