From patchwork Fri Apr 21 10:47:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 9692409 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7AC986037F for ; Fri, 21 Apr 2017 10:47:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 691F7205A4 for ; Fri, 21 Apr 2017 10:47:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5CED9206E2; Fri, 21 Apr 2017 10:47:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 95CC7205A4 for ; Fri, 21 Apr 2017 10:47:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1037934AbdDUKr2 (ORCPT ); Fri, 21 Apr 2017 06:47:28 -0400 Received: from s3.sipsolutions.net ([5.9.151.49]:41784 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S971323AbdDUKr1 (ORCPT ); Fri, 21 Apr 2017 06:47:27 -0400 Received: by sipsolutions.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1d1W60-0000mX-MJ; Fri, 21 Apr 2017 12:47:24 +0200 From: Johannes Berg To: backports@vger.kernel.org Cc: Johannes Berg Subject: [PATCH 1/2] backports: extend magic to 6 possible arguments Date: Fri, 21 Apr 2017 12:47:21 +0200 Message-Id: <20170421104722.21538-1-johannes@sipsolutions.net> X-Mailer: git-send-email 2.11.0 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Berg Signed-off-by: Johannes Berg --- backport/backport-include/backport/magic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backport/backport-include/backport/magic.h b/backport/backport-include/backport/magic.h index 222e02513ef2..d7e7cc961bbf 100644 --- a/backport/backport-include/backport/magic.h +++ b/backport/backport-include/backport/magic.h @@ -5,8 +5,8 @@ * http://efesx.com/2010/08/31/overloading-macros/ */ -#define VA_NUM_ARGS(...) VA_NUM_ARGS_IMPL(__VA_ARGS__, 5,4,3,2,1) -#define VA_NUM_ARGS_IMPL(_1,_2,_3,_4,_5,N,...) N +#define VA_NUM_ARGS(...) VA_NUM_ARGS_IMPL(__VA_ARGS__, 6,5,4,3,2,1) +#define VA_NUM_ARGS_IMPL(_1,_2,_3,_4,_5,_6,N,...) N #define macro_dispatcher(func, ...) \ macro_dispatcher_(func, VA_NUM_ARGS(__VA_ARGS__))