From patchwork Fri Sep 20 23:14:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Rosenstock X-Patchwork-Id: 2921901 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3FCCD9F1BF for ; Fri, 20 Sep 2013 23:15:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6C526204AB for ; Fri, 20 Sep 2013 23:15:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7918420495 for ; Fri, 20 Sep 2013 23:14:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752674Ab3ITXO6 (ORCPT ); Fri, 20 Sep 2013 19:14:58 -0400 Received: from mail-we0-f172.google.com ([74.125.82.172]:58458 "EHLO mail-we0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752509Ab3ITXO5 (ORCPT ); Fri, 20 Sep 2013 19:14:57 -0400 Received: by mail-we0-f172.google.com with SMTP id w61so1109939wes.17 for ; Fri, 20 Sep 2013 16:14:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:content-type:content-transfer-encoding; bh=QWytC/qluEOW1BnyAn+wIvifbOFm8gBDBF/hdNFcImA=; b=EqvkC2DwJacgKDHa7tP+QCRXbM2PD4+U4cVFQ5F4lJQxvWqXO3FgCfQPlV1F11gjBx Z3VgTJw9wrmPprD4AXMpeCqvrlS5CTQk8GERA4mTzTBINUN7dUtM6mvKzJ53yW1/90iQ ttss/ghNSC6RlYA2KPFWtVgMBqOnb3rZ2pn4WULf+9yaVGJbX4e1+4lVdS/6OrMsse/J mC7NLXgTMLJOMifQmIvYU4EvKUgZVjE6WSVh1VkVyPu3LX4iIjqLHi2sD6s5bSzdclc2 4Fc3UBtBUE75BY+FOBn4LW4Felet3MmPFapCQS9u3UeopYkK+KaYPt+p3HfXFy6P4Nwg Q9gw== X-Gm-Message-State: ALoCoQmx2QePzEUFtlK9fK3qnhEuSvQJzhqagVXKhu9DHml3yHxw9bcheVXdfCFJHeEWPRUQ5PKq X-Received: by 10.180.184.107 with SMTP id et11mr4606347wic.60.1379718896749; Fri, 20 Sep 2013 16:14:56 -0700 (PDT) Received: from [192.168.1.102] (c-98-229-118-119.hsd1.ma.comcast.net. [98.229.118.119]) by mx.google.com with ESMTPSA id dq11sm7856661wid.3.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 20 Sep 2013 16:14:56 -0700 (PDT) Message-ID: <523CD6EE.7050106@dev.mellanox.co.il> Date: Fri, 20 Sep 2013 19:14:54 -0400 From: Hal Rosenstock User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:9.0) Gecko/20111222 Thunderbird/9.0.1 MIME-Version: 1.0 To: Ido Shamay CC: "linux-rdma (linux-rdma@vger.kernel.org)" Subject: [PATCH perftest] multicast_resources.h: Guard against duplicated definitions of ntohll/htonll Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Hal Rosenstock --- -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/src/multicast_resources.h b/src/multicast_resources.h index bc85bae..1bfa043 100644 --- a/src/multicast_resources.h +++ b/src/multicast_resources.h @@ -80,8 +80,12 @@ #define DEF_FLOW_LABLE 0 // Macro for 64 bit variables to switch to from net +#ifndef ntohll #define ntohll(x) (((uint64_t)(ntohl((int)((x << 32) >> 32))) << 32) | (unsigned int)ntohl(((int)(x >> 32)))) +#endif +#ifndef htonll #define htonll(x) ntohll(x) +#endif // generate a bit mask S bits width #define MASK32(S) ( ((uint32_t) ~0L) >> (32-(S)) )