[TRUNK] Change the cl_pfn_fmap_cmp_t compare function to return an 'int' instead...

Additionally the change removes some usage of the non-standard C type 'intn_t' in favor of the basic C data type 'int'.

Files impacted:

inc\complib\cl_fleximap.h line #185 cl_pfn_fmap_cmp_t function returns 'int' instead of 'intn_t'.
core\al\kernel\al_ioc_pnp.c
core\al\kernel\al_pnp.c
ulp\wsd\user\ibsp_ip.c
ulp\ipoib\kernel\ipoib_port.c
ulp\ipoib\kernel\ipoib_port.cpp
ulp\wsd\user\ibspproto.h

Tested by:
  building WinOF installers for wlh, win7, wnet & wxp
  installing newly built installers.
  Running DAPL tests, IPoIB tests & opensm tests.

Signed-off-by: stan smith <stan.smith@intel.com>
git-svn-id: svn://openib.tc.cornell.edu/gen1@2559 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/core/al/kernel/al_ioc_pnp.c b/trunk/core/al/kernel/al_ioc_pnp.c
index b283ea1393278d3ea3d86e4af1cc676a9b93f2cc..498a08bf15d86f814f80d3eaf916c5afbbde5331 100644 (file)
--- a/trunk/core/al/kernel/al_ioc_pnp.c
+++ b/trunk/core/al/kernel/al_ioc_pnp.c
@@ -402,12 +402,12 @@ __put_ioc_map(
        IN                              ioc_pnp_mgr_t* const            p_ioc_mgr,\r
        IN                              cl_qmap_t* const                        p_ioc_map );\r
 \r
-static intn_t\r
+static int\r
 __iou_cmp(\r
        IN              const   void* const                                     p_key1,\r
        IN              const   void* const                                     p_key2 );\r
 \r
-static intn_t\r
+static int\r
 __path_cmp(\r
        IN              const   void* const                                     p_key1,\r
        IN              const   void* const                                     p_key2 );\r
@@ -1121,7 +1121,7 @@ __put_ioc_map(
  * address of the ca_guid, which is adjacent to the node GUID of the IOU.\r
  * This allows for a single call to cl_memcmp.\r
  */\r
-static intn_t\r
+static int\r
 __iou_cmp(\r
        IN              const   void* const                                     p_key1,\r
        IN              const   void* const                                     p_key2 )\r
@@ -1133,7 +1133,7 @@ __iou_cmp(
 /*\r
  * Compares two paths for inserts/lookups in a flexi map.\r
  */\r
-static intn_t\r
+static int\r
 __path_cmp(\r
        IN              const   void* const                                     p_key1,\r
        IN              const   void* const                                     p_key2 )\r

diff --git a/trunk/core/al/kernel/al_pnp.c b/trunk/core/al/kernel/al_pnp.c
index ac51a37f1be724dace725daccf1c15e45618ab8b..cca4fde62a0c905fc0c08dab84c2d6af4797a7be 100644 (file)
--- a/trunk/core/al/kernel/al_pnp.c
+++ b/trunk/core/al/kernel/al_pnp.c
@@ -89,7 +89,7 @@ __pnp_free(
  * address of the reg guid1, which is adjacent to the context guid2 (if exist).\r
  * This allows for a single call to cl_memcmp.\r
  */\r
-static intn_t\r
+static int\r
 __context_cmp128(\r
        IN              const   void* const                                     p_key1,\r
        IN              const   void* const                                     p_key2 )\r
@@ -102,7 +102,7 @@ __context_cmp128(
  * address of the reg guid1, which is adjacent to the context guid2 (if exist).\r
  * This allows for a single call to cl_memcmp.\r
  */\r
-static intn_t\r
+static int\r
 __context_cmp64(\r
        IN              const   void* const                                     p_key1,\r
        IN              const   void* const                                     p_key2 )\r

diff --git a/trunk/inc/complib/cl_fleximap.h b/trunk/inc/complib/cl_fleximap.h
index ffb5fcb76804601e8e52a7adb14224fc5671ca7d..30f72bf33a96e3d8b11290e06cb6669cace2082f 100644 (file)
--- a/trunk/inc/complib/cl_fleximap.h
+++ b/trunk/inc/complib/cl_fleximap.h
@@ -182,7 +182,7 @@ typedef struct _cl_fmap_item
 *\r
 * SYNOPSIS\r
 */\r
-typedef intn_t\r
+typedef int\r
 (CL_API *cl_pfn_fmap_cmp_t)(\r
        IN      const void* const               p_key1,\r
        IN      const void*     const           p_key2 );\r

diff --git a/trunk/ulp/ipoib/kernel/ipoib_port.c b/trunk/ulp/ipoib/kernel/ipoib_port.c
index 4d1736f7d2f19576d35590f0557154b70cb446b2..3773c7c77e726136535581717f073eb01310cb7e 100644 (file)
--- a/trunk/ulp/ipoib/kernel/ipoib_port.c
+++ b/trunk/ulp/ipoib/kernel/ipoib_port.c
@@ -476,7 +476,7 @@ __leave_error_mcast_cb(
        IN                              void                            *context );\r
 \r
 \r
-static intn_t\r
+static int\r
 __gid_cmp(\r
        IN              const   void* const                                     p_key1,\r
        IN              const   void* const                                     p_key2 )\r

diff --git a/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp b/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp
index 273e86faf6bafabace33ac7c72baeb1de8d9743c..c336a70dbec57a7d4614e4ff15039afd052d026b 100644 (file)
--- a/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp
+++ b/trunk/ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp
@@ -576,7 +576,7 @@ __leave_error_mcast_cb(
        IN                              void                            *context );\r
 \r
 \r
-static intn_t\r
+static int\r
 __gid_cmp(\r
        IN              const   void* const                                     p_key1,\r
        IN              const   void* const                                     p_key2 )\r

diff --git a/trunk/ulp/wsd/user/ibsp_ip.c b/trunk/ulp/wsd/user/ibsp_ip.c
index a31fbbd9eec901461c7893f59cafe1e3b354c5aa..a0afe89416cd5c287f143a12a118af65c72d8909 100644 (file)
--- a/trunk/ulp/wsd/user/ibsp_ip.c
+++ b/trunk/ulp/wsd/user/ibsp_ip.c
@@ -58,7 +58,7 @@ struct ip_query_context
 };\r
 \r
 \r
-intn_t CL_API\r
+int CL_API\r
 ip_cmp(\r
        IN      const void* const               p_key1,\r
        IN      const void*     const           p_key2 )\r

diff --git a/trunk/ulp/wsd/user/ibspproto.h b/trunk/ulp/wsd/user/ibspproto.h
index 34657703bcd5feeb621e55de94637b417c07e22c..8e1c80e8449fc8538269763fca061d5eedb48a54 100644 (file)
--- a/trunk/ulp/wsd/user/ibspproto.h
+++ b/trunk/ulp/wsd/user/ibspproto.h
@@ -152,7 +152,7 @@ ibal_to_wsa_error(
        IN                              const ib_api_status_t           status );\r
 \r
 /* Protos from ibsp_ip.c */\r
-intn_t CL_API\r
+int CL_API\r
 ip_cmp(\r
        IN      const void* const               p_key1,\r
        IN      const void*     const           p_key2 );\r