From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- release/src/router/busybox/libbb/perror_nomsg.c | 30 +++++++++---------------- 1 file changed, 11 insertions(+), 19 deletions(-) (limited to 'release/src/router/busybox/libbb/perror_nomsg.c') diff --git a/release/src/router/busybox/libbb/perror_nomsg.c b/release/src/router/busybox/libbb/perror_nomsg.c index 464cb86c..a157caa1 100644 --- a/release/src/router/busybox/libbb/perror_nomsg.c +++ b/release/src/router/busybox/libbb/perror_nomsg.c @@ -4,27 +4,19 @@ * * Copyright (C) 2003 Manuel Novoa III * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include -#include +/* gcc warns about a null format string, therefore we provide + * modified definition without "attribute (format)" + * instead of including libbb.h */ +//#include "libbb.h" +#include "platform.h" +extern void bb_perror_msg(const char *s, ...) FAST_FUNC; -extern void bb_perror_nomsg(void) +/* suppress gcc "no previous prototype" warning */ +void FAST_FUNC bb_perror_nomsg(void); +void FAST_FUNC bb_perror_nomsg(void) { - /* Ignore the gcc warning about a null format string. */ - bb_perror_msg(NULL); + bb_perror_msg(0); } -- cgit v1.2.3-54-g00ecf