summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--unix/configure.in3
-rw-r--r--win/configure.in3
-rw-r--r--win/makefile.vc4
4 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 671d624..6d22d66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-31 Miguel Sofer <msofer@users.sf.net>
+
+ * unix/configure.in: allow use of 'inline' in Tcl sources
+ * win/configure.in: [Patch 1754128]
+ * win/makefile.vc:
+
2007-07-31 Donal K. Fellows <donal.k.fellows@manchester.ac.uk>
* unix/tclUnixInit.c (TclpSetVariables): Use the thread-safe getpwuid
diff --git a/unix/configure.in b/unix/configure.in
index 44d720f..7bf0da2 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to
dnl generate the file "configure", which is run during Tcl installation
dnl to configure the system for the local environment.
#
-# RCS: @(#) $Id: configure.in,v 1.158 2007/06/06 09:53:42 das Exp $
+# RCS: @(#) $Id: configure.in,v 1.159 2007/07/31 14:03:29 msofer Exp $
AC_INIT([tcl],[8.5])
AC_PREREQ(2.59)
@@ -61,6 +61,7 @@ if test "${CFLAGS+set}" != "set" ; then
fi
AC_PROG_CC
+AC_C_INLINE
#--------------------------------------------------------------------
# Supply substitutes for missing POSIX header files. Special notes:
diff --git a/win/configure.in b/win/configure.in
index 0c8b38e..e2b790f 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -3,7 +3,7 @@
# generate the file "configure", which is run during Tcl installation
# to configure the system for the local environment.
#
-# RCS: @(#) $Id: configure.in,v 1.92 2007/05/18 18:39:34 dgp Exp $
+# RCS: @(#) $Id: configure.in,v 1.93 2007/07/31 14:03:30 msofer Exp $
AC_INIT(../generic/tcl.h)
AC_PREREQ(2.59)
@@ -55,6 +55,7 @@ if test "${CFLAGS+set}" != "set" ; then
fi
AC_PROG_CC
+AC_C_INLINE
# To properly support cross-compilation, one would
# need to use these tool checks instead of
diff --git a/win/makefile.vc b/win/makefile.vc
index 4ea7135..77b3538 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
# Copyright (c) 2001-2004 David Gravereaux.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.161 2007/06/28 21:24:58 dgp Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.162 2007/07/31 14:03:30 msofer Exp $
#------------------------------------------------------------------------------
# Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -456,7 +456,7 @@ crt = -MT
TCL_INCLUDES = -I"$(WINDIR)" -I"$(GENERICDIR)" -I"$(TOMMATHDIR)"
BASE_CFLAGS = $(cflags) $(cdebug) $(crt) $(TCL_INCLUDES) \
-DTCL_PIPE_DLL=\"$(TCLPIPEDLLNAME)\" -DTCL_TOMMATH \
- -DMP_PREC=4
+ -DMP_PREC=4 -Dinline=__inline
CON_CFLAGS = $(cflags) $(cdebug) $(crt) -DCONSOLE
TCL_CFLAGS = $(BASE_CFLAGS) $(OPTDEFINES)
STUB_CFLAGS = $(cflags) $(cdebug) $(OPTDEFINES)