From patchwork Thu Oct 8 16:46:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Smith, Stan" X-Patchwork-Id: 52539 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 n98Go769003179 for ; Thu, 8 Oct 2009 16:50:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755260AbZJHQq4 (ORCPT ); Thu, 8 Oct 2009 12:46:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758842AbZJHQq4 (ORCPT ); Thu, 8 Oct 2009 12:46:56 -0400 Received: from mga01.intel.com ([192.55.52.88]:38756 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755260AbZJHQqz (ORCPT ); Thu, 8 Oct 2009 12:46:55 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 08 Oct 2009 09:40:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.44,526,1249282800"; d="scan'208";a="501148210" Received: from scsmith-mobl1.amr.corp.intel.com (HELO scsmithMOBL1) ([10.7.151.219]) by fmsmga002.fm.intel.com with ESMTP; 08 Oct 2009 09:38:01 -0700 From: "Stan C. Smith" To: "'Sasha Khapyorsky'" Cc: , "'linux-rdma'" Subject: [PATCH] opensm - add OSM_CDECL to qsort compare function definitions Date: Thu, 8 Oct 2009 09:46:12 -0700 Message-ID: <6678A2C4663F40F3AC7B364C6ACFCC9F@amr.corp.intel.com> MIME-Version: 1.0 X-Mailer: Microsoft Office Outlook 11 Thread-Index: AcpINthOrINRvKNBRIesRQeo19DGtg== X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.5579 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org diff --git a/opensm/opensm/osm_mesh.c b/opensm/opensm/osm_mesh.c index 9469420..a2a3a12 100644 --- a/opensm/opensm/osm_mesh.c +++ b/opensm/opensm/osm_mesh.c @@ -1368,7 +1368,7 @@ static int reorder_links(lash_t *p_lash, mesh_t *mesh) /* * compare two switches in a sort */ -static int compare_switches(const void *p1, const void *p2) +static int OSM_CDECL compare_switches(const void *p1, const void *p2) { const comp_t *cp1 = p1, *cp2 = p2; const sort_ctx_t *ctx = &cp1->ctx; diff --git a/opensm/opensm/osm_ucast_ftree.c b/opensm/opensm/osm_ucast_ftree.c index 1defd95..bafe9ce 100644 --- a/opensm/opensm/osm_ucast_ftree.c +++ b/opensm/opensm/osm_ucast_ftree.c @@ -225,7 +225,7 @@ typedef struct ftree_fabric_t_ { ** ***************************************************/ -static int compare_switches_by_index(IN const void *p1, IN const void *p2) +static int OSM_CDECL compare_switches_by_index(IN const void *p1, IN const void *p2) { ftree_sw_t **pp_sw1 = (ftree_sw_t **) p1; ftree_sw_t **pp_sw2 = (ftree_sw_t **) p2; @@ -242,7 +242,7 @@ static int compare_switches_by_index(IN const void *p1, IN const void *p2) /***************************************************/ -static int +static int OSM_CDECL compare_port_groups_by_remote_switch_index(IN const void *p1, IN const void *p2) { ftree_port_group_t **pp_g1 = (ftree_port_group_t **) p1; diff --git a/opensm/opensm/osm_ucast_mgr.c b/opensm/opensm/osm_ucast_mgr.c index be37df9..57cf2ad 100644 --- a/opensm/opensm/osm_ucast_mgr.c +++ b/opensm/opensm/osm_ucast_mgr.c @@ -723,7 +723,7 @@ static void sw_count_endport_links(osm_switch_t * sw) } } -static int compar_sw_load(const void *s1, const void *s2) +static int OSM_CDECL compar_sw_load(const void *s1, const void *s2) { #define get_sw_endport_links(s) (*(osm_switch_t **)s)->endport_links return get_sw_endport_links(s2) - get_sw_endport_links(s1);