summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-06-18 07:00:04 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-06-18 07:00:04 (GMT)
commitc694b80895cefb1f73e090593b507dfa7f6a213e (patch)
tree6fc5ca2c9dcce11b495bfe1f4f3d7fcb59da6b50
parentff8fb44d1b74a43cc1e608f3ffdaa3b1c5845fa1 (diff)
downloadtcl-c694b80895cefb1f73e090593b507dfa7f6a213e.zip
tcl-c694b80895cefb1f73e090593b507dfa7f6a213e.tar.gz
tcl-c694b80895cefb1f73e090593b507dfa7f6a213e.tar.bz2
Better place to put vsnprintf switch, so it is usable by all *.c files.
Fix comment on _ANSI_ARGS_ which is no longer true since 8.6.
-rw-r--r--generic/tclInt.h7
-rw-r--r--win/tclWinFile.c4
-rw-r--r--win/tclWinInt.h6
3 files changed, 5 insertions, 12 deletions
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 2d3a248..3432b37 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -30,8 +30,7 @@
* here, so that system-dependent personalizations for the include files only
* have to be made in once place. This results in a few extra includes, but
* greater modularity. The order of the three groups of #includes is
- * important. For example, stdio.h is needed by tcl.h, and the _ANSI_ARGS_
- * declaration in tcl.h is needed by stdlib.h in some configurations.
+ * important. For example, stdio.h is needed by tcl.h.
*/
#include "tclPort.h"
@@ -119,6 +118,10 @@ typedef int ptrdiff_t;
# endif
#endif
+#if defined(_WIN32) && defined(_MSC_VER)
+# define vsnprintf _vsnprintf
+#endif
+
/*
* The following procedures allow namespaces to be customized to support
* special name resolution rules for commands/variables.
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 31fa603..1d9f93a 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -18,10 +18,6 @@
#include <shlobj.h>
#include <lm.h> /* For TclpGetUserHome(). */
-#if defined(_MSC_VER)
-# define vsnprintf _vsnprintf
-#endif
-
/*
* The number of 100-ns intervals between the Windows system epoch (1601-01-01
* on the proleptic Gregorian calendar) and the Posix epoch (1970-01-01).
diff --git a/win/tclWinInt.h b/win/tclWinInt.h
index 22ad8e9..882b811 100644
--- a/win/tclWinInt.h
+++ b/win/tclWinInt.h
@@ -33,12 +33,6 @@
# define TCL_I_MODIFIER ""
#endif
-#ifdef _WIN64
-# define TCL_I_MODIFIER "I"
-#else
-# define TCL_I_MODIFIER ""
-#endif
-
/*
* Declarations of functions that are not accessible by way of the
* stubs table.