From patchwork Fri Oct 16 23:51:41 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Arlin Davis <arlin.r.davis@intel.com>
X-Patchwork-Id: 54471
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9GNpvPn025876
	for <patchwork-linux-rdma@patchwork.kernel.org>;
	Fri, 16 Oct 2009 23:51:59 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1750911AbZJPXvx (ORCPT
	<rfc822;patchwork-linux-rdma@patchwork.kernel.org>);
	Fri, 16 Oct 2009 19:51:53 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751645AbZJPXvx
	(ORCPT <rfc822;linux-rdma-outgoing>);
	Fri, 16 Oct 2009 19:51:53 -0400
Received: from mga14.intel.com ([143.182.124.37]:9259 "EHLO mga14.intel.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1750911AbZJPXvx convert rfc822-to-8bit (ORCPT
	<rfc822; linux-rdma@vger.kernel.org>); Fri, 16 Oct 2009 19:51:53 -0400
Received: from azsmga001.ch.intel.com ([10.2.17.19])
	by azsmga102.ch.intel.com with ESMTP; 16 Oct 2009 16:51:57 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="4.44,576,1249282800"; d="scan'208";a="200003293"
Received: from orsmsx602.amr.corp.intel.com ([10.22.226.211])
	by azsmga001.ch.intel.com with ESMTP; 16 Oct 2009 16:51:55 -0700
Received: from orsmsx506.amr.corp.intel.com ([10.22.226.44]) by
	orsmsx602.amr.corp.intel.com ([10.22.226.211]) with mapi;
	Fri, 16 Oct 2009 16:51:43 -0700
From: "Davis, Arlin R" <arlin.r.davis@intel.com>
To: linux-rdma <linux-rdma@vger.kernel.org>,
	"ofw@lists.openfabrics.org" <ofw@lists.openfabrics.org>
CC: "Smith, Stan" <stan.smith@intel.com>, "Hefty,
	Sean" <sean.hefty@intel.com>
Date: Fri, 16 Oct 2009 16:51:41 -0700
Subject: [PATCH 08/11]  ucm: fix build problem with latest windows ucm
	changes
Thread-Topic: [PATCH 08/11] ucm: fix build problem with latest windows ucm
	changes
Thread-Index: AcpOu5vZV3tHEqgBTTOY3qmTfyMlQw==
Message-ID: 
 <E3280858FA94444CA49D2BA02341C9835ECA1CCA@orsmsx506.amr.corp.intel.com>
Accept-Language: en-US
Content-Language: en-US
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
acceptlanguage: en-US
MIME-Version: 1.0
Sender: linux-rdma-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-rdma.vger.kernel.org>
X-Mailing-List: linux-rdma@vger.kernel.org


diff --git a/dapl/openib_ucm/linux/openib_osd.h b/dapl/openib_ucm/linux/openib_osd.h
index cf40fc9..fe60aa0 100644
--- a/dapl/openib_ucm/linux/openib_osd.h
+++ b/dapl/openib_ucm/linux/openib_osd.h
@@ -11,6 +11,12 @@
 #define htonll(x)  bswap_64(x)
 #define ntohll(x)  bswap_64(x)
 #endif
+#ifndef STATIC
+#define STATIC static
+#endif /* STATIC */
+#ifndef _INLINE_
+#define _INLINE_ __inline__
+#endif /* _INLINE_ */
 
 #define DAPL_SOCKET int
 #define DAPL_INVALID_SOCKET -1
@@ -23,7 +29,7 @@ struct dapl_thread_signal
 	DAPL_SOCKET scm[2];
 };
 
-static void dapls_thread_signal(struct dapl_thread_signal *signal)
+STATIC _INLINE_ void dapls_thread_signal(struct dapl_thread_signal *signal)
 {
 	send(signal->scm[1], "w", sizeof "w", 0);
 }