From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753581AbcFQRYz (ORCPT ); Fri, 17 Jun 2016 13:24:55 -0400 Received: from mail-qk0-f174.google.com ([209.85.220.174]:34871 "EHLO mail-qk0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751134AbcFQRYy (ORCPT ); Fri, 17 Jun 2016 13:24:54 -0400 From: Matt Ullman To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, Matt Ullman Subject: [PATCH v2] lib: Make strreplace prototype compatible with C++ Date: Fri, 17 Jun 2016 13:24:12 -0400 Message-Id: <20160617172412.9644-1-staticfox@staticfox.net> X-Mailer: git-send-email 2.7.0.1585.g05219a1 In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since "new" is a keyword in C++, this breaks compilation when string.h is included in a C++ file. For example, this affects VirtualBox Guest Additions. https://www.virtualbox.org/pipermail/vbox-dev/2015-August/013368.html Signed-off-by: Matt Ullman --- Thanks for your feedback and I agree. I've made the requested changes. include/linux/string.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/string.h b/include/linux/string.h index 26b6f6a..1e5183b 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -115,7 +115,7 @@ extern int memcmp(const void *,const void *,__kernel_size_t); extern void * memchr(const void *,int,__kernel_size_t); #endif void *memchr_inv(const void *s, int c, size_t n); -char *strreplace(char *s, char old, char new); +char *strreplace(char *, char, char); extern void kfree_const(const void *x); -- 2.9.0