[ofa-general] Re: [PATCH RFC] opensm/ib_types.h: remove ifdef WIN conditions

[Hal Rosenstock]

Sasha,

On Sun, 2008-01-06 at 15:43 +0000, Sasha Khapyorsky wrote:
> It was stated couple of times that in windows another instance of
> ib_types.h file is used. If so we don't need to keep those 'ifdef WIN'
> conditions here. Also this removes empty __ptr64 macro.

Shouldn't this also be sent to ofw for comments ?

Also, ib_cm_types.h looks like it should be changed as well in terms of
this.

Since master and ofed_1_3 are no longer identical, please indicate for
which branch(es) patches are intended.

-- Hal

> Signed-off-by: Sasha Khapyorsky <sashak at voltaire.com>
> ---
>  opensm/include/iba/ib_types.h |   36 ++++++++++--------------------------
>  1 files changed, 10 insertions(+), 26 deletions(-)
> 
> diff --git a/opensm/include/iba/ib_types.h b/opensm/include/iba/ib_types.h
> index 672184b..a438d8a 100644
> --- a/opensm/include/iba/ib_types.h
> +++ b/opensm/include/iba/ib_types.h
> @@ -49,20 +49,9 @@
>  #endif				/* __cplusplus */
>  
>  BEGIN_C_DECLS
> -#if defined( WIN32 ) || defined( _WIN64 )
> -#if defined( EXPORT_AL_SYMBOLS )
> -#define OSM_EXPORT	__declspec(dllexport)
> -#else
> -#define OSM_EXPORT	__declspec(dllimport)
> -#endif
> -#define OSM_API __stdcall
> -#define OSM_CDECL __cdecl
> -#else
>  #define OSM_EXPORT	extern
>  #define OSM_API
>  #define OSM_CDECL
> -#define __ptr64
> -#endif
>  /****h* IBA Base/Constants
>  * NAME
>  *	Constants
> @@ -8241,22 +8230,21 @@ typedef struct _ib_ioc_info {
>  /*
>   *	The following definitions are shared between the Access Layer and VPD
>   */
> -typedef struct _ib_ca *__ptr64 ib_ca_handle_t;
> -typedef struct _ib_pd *__ptr64 ib_pd_handle_t;
> -typedef struct _ib_rdd *__ptr64 ib_rdd_handle_t;
> -typedef struct _ib_mr *__ptr64 ib_mr_handle_t;
> -typedef struct _ib_mw *__ptr64 ib_mw_handle_t;
> -typedef struct _ib_qp *__ptr64 ib_qp_handle_t;
> -typedef struct _ib_eec *__ptr64 ib_eec_handle_t;
> -typedef struct _ib_cq *__ptr64 ib_cq_handle_t;
> -typedef struct _ib_av *__ptr64 ib_av_handle_t;
> -typedef struct _ib_mcast *__ptr64 ib_mcast_handle_t;
> +typedef struct _ib_ca * ib_ca_handle_t;
> +typedef struct _ib_pd * ib_pd_handle_t;
> +typedef struct _ib_rdd * ib_rdd_handle_t;
> +typedef struct _ib_mr * ib_mr_handle_t;
> +typedef struct _ib_mw * ib_mw_handle_t;
> +typedef struct _ib_qp * ib_qp_handle_t;
> +typedef struct _ib_eec * ib_eec_handle_t;
> +typedef struct _ib_cq * ib_cq_handle_t;
> +typedef struct _ib_av * ib_av_handle_t;
> +typedef struct _ib_mcast * ib_mcast_handle_t;
>  
>  /* Currently for windows branch, use the extended version of ib special verbs struct
>  	in order to be compliant with Infinicon ib_types; later we'll change it to support
>  	OpenSM ib_types.h */
>  
> -#ifndef WIN32
>  /****d* Access Layer/ib_api_status_t
>  * NAME
>  *	ib_api_status_t
> @@ -10710,8 +10698,4 @@ typedef struct _ib_ci_op {
>  *****/
>  
>  END_C_DECLS
> -#endif				/* ndef WIN32 */
> -#if defined( __WIN__ )
> -#include <iba/ib_types_extended.h>
> -#endif
>  #endif				/* __IB_TYPES_H__ */