[openib-general] [PATCH 2/3] osm: Changes for windows compatability

[Yevgeny Kliteynik]

Hi Sasha.

Sasha Khapyorsky wrote:
> Hi Yevgeny,
> 
> On 11:03 Wed 27 Dec     , Yevgeny Kliteynik wrote:
>> Hi Hal.
>>
>> Fixing windows compilation problems.
>>
>> Signed-off-by: Yevgeny Kliteynik <kliteyn at dev.mellanox.co.il>
>> ---
>>  osm/opensm/osm_ucast_ftree.c |   42 ++++++++++++++++++++++--------------------
>>  1 files changed, 22 insertions(+), 20 deletions(-)
>>
>> diff --git a/osm/opensm/osm_ucast_ftree.c b/osm/opensm/osm_ucast_ftree.c
>> index ba95a0d..054e3c9 100644
>> --- a/osm/opensm/osm_ucast_ftree.c
>> +++ b/osm/opensm/osm_ucast_ftree.c
> 
> [snip..]
> 
>> @@ -226,7 +226,7 @@ typedef struct ftree_fabric_t_
>>   **
>>   ***************************************************/
>>  
>> -int
>> +int OSM_CDECL
>>  __osm_ftree_compare_switches_by_index(
>>     IN  const void * p1, 
>>     IN  const void * p2)
> 
> Is this function is used somewhere in a global namespace? If no, this
> probably should be 'static' and don't have OSM_CDECL attribute. If yes,
> isn't this cleaner to have OSM_CDECL in header file, where the function
> prototype is located?
 
The function should be 'static __cdecl'.
I'll check with the windows guys regarding the __cdecl not being default.

>> @@ -247,7 +247,7 @@ __osm_ftree_compare_switches_by_index(
>>  
>>  /***************************************************/
>>  
>> -int
>> +int OSM_CDECL
>>  __osm_ftree_compare_port_groups_by_remote_switch_index(
>>     IN  const void * p1, 
>>     IN  const void * p2)
> 
> Ditto.

Right, same thing here.

Thanks.

--Yevgeny

 
> Sasha
>