[Openocd-svn] r1589 - trunk/src/helper

[<oh...@ma...>]

Author: oharboe
Date: 2009-05-02 14:26:10 +0200 (Sat, 02 May 2009)
New Revision: 1589

Modified:
   trunk/src/helper/jim.c
Log:
Zach Welch <zw...@su...> fix warnings

Modified: trunk/src/helper/jim.c
===================================================================
--- trunk/src/helper/jim.c	2009-05-01 23:42:43 UTC (rev 1588)
+++ trunk/src/helper/jim.c	2009-05-02 12:26:10 UTC (rev 1589)
@@ -89,7 +89,7 @@
 #endif /* WIN32 */
 #endif /* JIM_DYNLIB */
 
-#ifndef WIN32
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
@@ -118,7 +118,7 @@
 static void JimFreeCallFrame(Jim_Interp *interp, Jim_CallFrame *cf, int flags);
 static void JimRegisterCoreApi(Jim_Interp *interp);
 
-static Jim_HashTableType JimVariablesHashTableType;
+static Jim_HashTableType *getJimVariablesHashTableType(void);
 
 /* -----------------------------------------------------------------------------
  * Utility functions
@@ -3237,7 +3237,7 @@
         Jim_ListLength(interp, staticsListObjPtr, &len);
         if (len != 0) {
             cmdPtr->staticVars = Jim_Alloc(sizeof(Jim_HashTable));
-            Jim_InitHashTable(cmdPtr->staticVars, &JimVariablesHashTableType,
+            Jim_InitHashTable(cmdPtr->staticVars, getJimVariablesHashTableType(),
                     interp);
             for (i = 0; i < len; i++) {
                 Jim_Obj *objPtr, *initObjPtr, *nameObjPtr;
@@ -3440,6 +3440,11 @@
     JimVariablesHTValDestructor       /* val destructor */
 };
 
+static Jim_HashTableType *getJimVariablesHashTableType(void)
+{
+	return &JimVariablesHashTableType;
+}
+
 /* -----------------------------------------------------------------------------
  * Variable object
  * ---------------------------------------------------------------------------*/