|
From: <zw...@ma...> - 2009-05-11 13:20:54
|
Author: zwelch
Date: 2009-05-11 13:20:45 +0200 (Mon, 11 May 2009)
New Revision: 1744
Modified:
trunk/configure.in
trunk/src/helper/jim-eventloop.c
trunk/src/helper/jim.c
trunk/src/helper/jim.h
Log:
Update jim helper files to use proper configure script support:
- configure.in: Add AC_TYPE_LONG_LONG_INT to detect 'long long int' support.
- configure.in: Add AC_C_CONST to provide equivalent support as jim.h.
- jim*.c: include config.h when HAVE_CONFIG_H is defined.
- jim*.{h,c}: use HAVE_LONG_LONG_INT definition from config.h.
- jim.h: Remove hard-coded const and HAVE_LONG_LONG definitions.
- jim.h: -DJIM_NO_CONST has been obsoleted; -Dconst is equivalent.
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2009-05-11 10:10:11 UTC (rev 1743)
+++ trunk/configure.in 2009-05-11 11:20:45 UTC (rev 1744)
@@ -816,6 +816,10 @@
AC_PROG_RANLIB
AC_PROG_LIBTOOL
+dnl configure checks required for Jim files (these are obsolete w/ C99)
+AC_C_CONST
+AC_TYPE_LONG_LONG_INT
+
# Look for environ alternatives. Possibility #1: is environ in unistd.h or stdlib.h?
AC_MSG_CHECKING([for environ in unistd.h and stdlib.h])
AC_COMPILE_IFELSE([
Modified: trunk/src/helper/jim-eventloop.c
===================================================================
--- trunk/src/helper/jim-eventloop.c 2009-05-11 10:10:11 UTC (rev 1743)
+++ trunk/src/helper/jim-eventloop.c 2009-05-11 11:20:45 UTC (rev 1744)
@@ -44,6 +44,9 @@
* - more complete [after] command with [after info] and other subcommands.
* - Win32 port
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#define JIM_EXTENSION
#define __JIM_EVENTLOOP_CORE__
Modified: trunk/src/helper/jim.c
===================================================================
--- trunk/src/helper/jim.c 2009-05-11 10:10:11 UTC (rev 1743)
+++ trunk/src/helper/jim.c 2009-05-11 11:20:45 UTC (rev 1744)
@@ -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 */
@@ -160,7 +164,7 @@
* 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 +428,7 @@
{
char *endptr;
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
*widePtr = JimStrtoll(str, &endptr, base);
#else
*widePtr = strtol(str, &endptr, base);
@@ -7662,7 +7666,7 @@
/* 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),
Modified: trunk/src/helper/jim.h
===================================================================
--- trunk/src/helper/jim.h 2009-05-11 10:10:11 UTC (rev 1743)
+++ trunk/src/helper/jim.h 2009-05-11 11:20:45 UTC (rev 1744)
@@ -78,25 +78,6 @@
#include <stdarg.h> /* In order to get type va_list */
/* -----------------------------------------------------------------------------
-* Some /very/ old compiler maybe do not know how to
-* handle 'const'. They even do not know, how to ignore
-* it. For those compiler it may be better to compile with
-* define JIM_NO_CONST activated
-* ---------------------------------------------------------------------------*/
-
-#ifdef JIM_NO_CONST
-# define const
-#endif
-
-/* -----------------------------------------------------------------------------
- * System configuration
- * For most modern systems, you can leave the default.
- * For embedded systems some change may be required.
- * ---------------------------------------------------------------------------*/
-
-#define HAVE_LONG_LONG
-
-/* -----------------------------------------------------------------------------
* Compiler specific fixes.
* ---------------------------------------------------------------------------*/
@@ -106,7 +87,7 @@
#endif /* _MSC_VER */
/* Long Long type and related issues */
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
# ifdef _MSC_VER /* MSC compiler */
# define jim_wide _int64
# ifndef LLONG_MAX
@@ -138,7 +119,7 @@
* LIBC specific fixes
* ---------------------------------------------------------------------------*/
-#ifdef HAVE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
# if defined(_MSC_VER) || defined(__MSVCRT__)
# define JIM_WIDE_MODIFIER "I64d"
# else
|