Audit and reduce #include directives in jim source files.

[openocd.git] / src / helper / jim.c

diff --git a/src/helper/jim.c b/src/helper/jim.c
index 7c758ba1ed3810989300e8c0860fd6b1e9166728..e344ef590cb1a393a249b256f144a7dc54ff0454 100644 (file)
--- a/src/helper/jim.c
+++ b/src/helper/jim.c
@@ -39,6 +39,10 @@
  * are those of the authors and should not be interpreted as representing
  * official policies, either expressed or implied, of the Jim Tcl Project.
  **/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #define __JIM_CORE__
 #define JIM_OPTIMIZATION /* comment to avoid optimizations and reduce size */
 
@@ -49,23 +53,8 @@
 #define JIM_DYNLIB      /* Dynamic library support for UNIX and WIN32 */
 #endif /* JIM_ANSIC */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE    /* for vasprintf() */
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <stdarg.h>
-#include <ctype.h>
 #include <limits.h>
-#include <assert.h>
-#include <errno.h>
-#include <time.h>
-#if defined(WIN32)
-/* sys/time - need is different */
-#else
-#include <sys/time.h> // for gettimeofday()
-#endif
 
 #include "replacements.h"
 
@@ -89,10 +78,6 @@
 #endif /* WIN32 */
 #endif /* JIM_DYNLIB */
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #ifdef __ECOS
 #include <cyg/jimtcl/jim.h>
 #else
@@ -160,7 +145,7 @@ jim_vasprintf_done( void *buf )
  * Ignores `locale' stuff.  Assumes that the upper and lower case
  * alphabets and digits are each contiguous.
  */
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
 #define JimIsAscii(c) (((c) & ~0x7f) == 0)
 static jim_wide JimStrtoll(const char *nptr, char **endptr, register int base)
 {
@@ -424,7 +409,7 @@ int Jim_StringToWide(const char *str, jim_wide *widePtr, int base)
 {
     char *endptr;
 
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
     *widePtr = JimStrtoll(str, &endptr, base);
 #else
     *widePtr = strtol(str, &endptr, base);
@@ -7662,7 +7647,7 @@ static int ScanOneEntry(Jim_Interp *interp, const char *str, long pos,
                     /* Try to scan a number with the given base */
                     if (descr->modifier == 'l')
                     {
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
                         jwvalue = JimStrtoll(tok, &endp, base),
 #else
                         jwvalue = strtol(tok, &endp, base),