From 8f313cebe943aa406956824845bebd8690cb10d9 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Wed, 28 Apr 2010 18:15:50 +0000 Subject: rename BS so we don't collide with the ocurses define, makes gcc4 happy. ok deraadt@ 'Looks safe' miod@ --- distrib/special/more/more.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'distrib/special') diff --git a/distrib/special/more/more.c b/distrib/special/more/more.c index eb0bdb39427..fb8bf5cdde7 100644 --- a/distrib/special/more/more.c +++ b/distrib/special/more/more.c @@ -1,4 +1,4 @@ -/* $OpenBSD: more.c,v 1.30 2010/01/14 00:47:30 deraadt Exp $ */ +/* $OpenBSD: more.c,v 1.31 2010/04/28 18:15:49 jsg Exp $ */ /* * Copyright (c) 2003 Todd C. Miller @@ -1629,14 +1629,14 @@ again: return (ch); } -static char BS = '\b'; +static char BS1 = '\b'; static char BSB[] = "\b \b"; static char CARAT = '^'; #define ERASEONECHAR do { \ if (docrterase) \ write(STDERR_FILENO, BSB, sizeof(BSB) - 1); \ else \ - write(STDERR_FILENO, &BS, 1); \ + write(STDERR_FILENO, &BS1, 1); \ } while (0) int -- cgit v1.2.3