[openib-general] [PATCH] Opensm - change default dir for Windows

[Yael Kalka]

Hi Hal,

The following patch includes some fixes for the windows stack:
1. Add needed __cdecl.
2. Change the default directories/files names.

Thanks,
Yael

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

Index: include/opensm/osm_base.h
===================================================================
--- include/opensm/osm_base.h   (revision 5307)
+++ include/opensm/osm_base.h   (working copy)
@@ -50,6 +50,13 @@
 #ifndef _OSM_BASE_H_
 #define _OSM_BASE_H_
 
+#ifdef __WIN__
+#include <vendor/winosm_common.h>
+#define OSM_CDECL __cdecl
+#else
+#define OSM_CDECL
+#endif
+
 #include <complib/cl_types.h>
 
 #ifdef __cplusplus
@@ -176,7 +183,7 @@ BEGIN_C_DECLS
 * SYNOPSIS
 */
 #ifdef __WIN__
-#define OSM_DEFAULT_TMP_DIR "C:\\Windows\\Temp\\"
+#define OSM_DEFAULT_TMP_DIR GetOsmPath()
 #else
 #define OSM_DEFAULT_TMP_DIR "/tmp/"
 #endif
@@ -188,11 +195,12 @@ BEGIN_C_DECLS
 *
 * DESCRIPTION
 *      Specifies the default cache directory for the db files.
+*      Note that the directory must appear with "/" ("\\" for windows) at the end.
 *
 * SYNOPSIS
 */
 #ifdef __WIN__
-#define OSM_DEFAULT_CACHE_DIR "C:\\Windows\\Temp\\"
+#define OSM_DEFAULT_CACHE_DIR GetOsmPath()
 #else
 #define OSM_DEFAULT_CACHE_DIR "/var/cache/osm/"
 #endif
@@ -208,7 +216,7 @@ BEGIN_C_DECLS
 * SYNOPSIS
 */
 #ifdef __WIN__
-#define OSM_DEFAULT_LOG_FILE "C:\\Windows\\Temp\\osm.log"
+#define OSM_DEFAULT_LOG_FILE strcat(GetOsmPath(), "osm.log")
 #else
 #define OSM_DEFAULT_LOG_FILE "/var/log/osm.log"
 #endif