[openib-general] [PATCH] OpenSM - fixes for windows

Yael Kalka yael at mellanox.co.il
Tue Mar 21 03:48:42 PST 2006


Hi Hal,

The following patch includes fixes for the windows compilation:
 __msecs_to_rtv_table in osm_sa_clall_port_info is used as uint32_t
and not regular int, and thus can be defined as such.
Also there is some function name changing in windows for the default
paths.

Thanks,
Yael

Signed-off-by:  Yael Kalka <yael at mellanox.co.il>

Index: opensm/osm_sa_class_port_info.c
===================================================================
--- opensm/osm_sa_class_port_info.c	(revision 5919)
+++ opensm/osm_sa_class_port_info.c	(working copy)
@@ -69,7 +69,7 @@
 #define MAX_MSECS_TO_RTV 24
 /* Precalculated table in msec (index is related to encoded value) */
 /* 4.096 usec * 2 ** n (where n = 8 - 31) */
-static int __msecs_to_rtv_table[MAX_MSECS_TO_RTV] =
+static uint32_t __msecs_to_rtv_table[MAX_MSECS_TO_RTV] =
 					{ 1, 2, 4, 8,
 					  16, 33, 67, 134, 
 					  268, 536, 1073, 2147,
Index: include/opensm/osm_base.h
===================================================================
--- include/opensm/osm_base.h	(revision 5919)
+++ include/opensm/osm_base.h	(working copy)
@@ -183,7 +183,7 @@ BEGIN_C_DECLS
 * SYNOPSIS
 */
 #ifdef __WIN__
-#define OSM_DEFAULT_TMP_DIR GetOsmPath()
+#define OSM_DEFAULT_TMP_DIR GetOsmTempPath()
 #else
 #define OSM_DEFAULT_TMP_DIR "/tmp/"
 #endif
@@ -200,7 +200,7 @@ BEGIN_C_DECLS
 * SYNOPSIS
 */
 #ifdef __WIN__
-#define OSM_DEFAULT_CACHE_DIR GetOsmPath()
+#define OSM_DEFAULT_CACHE_DIR GetOsmCachePath()
 #else
 #define OSM_DEFAULT_CACHE_DIR "/var/cache/osm/"
 #endif
@@ -216,7 +216,7 @@ BEGIN_C_DECLS
 * SYNOPSIS
 */
 #ifdef __WIN__
-#define OSM_DEFAULT_LOG_FILE strcat(GetOsmPath(), "osm.log")
+#define OSM_DEFAULT_LOG_FILE strcat(GetOsmTempPath(), "osm.log")
 #else
 #define OSM_DEFAULT_LOG_FILE "/var/log/osm.log"
 #endif




More information about the general mailing list