diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-11-30 15:42:56 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-11-30 15:42:56 (GMT) |
| commit | 64a81406f2649f08e1e61f68a92ef77fc2c31f32 (patch) | |
| tree | 4643e6c67f1d1d2d7f0621d3887353e0ea82cf93 /win | |
| parent | 83409874d9644cc0926e20e01bd7213c07412db5 (diff) | |
| parent | 02e5732cffb9d23e1ea6612ee37c19a88e4891f2 (diff) | |
| download | tcl-64a81406f2649f08e1e61f68a92ef77fc2c31f32.zip tcl-64a81406f2649f08e1e61f68a92ef77fc2c31f32.tar.gz tcl-64a81406f2649f08e1e61f68a92ef77fc2c31f32.tar.bz2 | |
merge (modified) novem-review.
unbreak windows build
Diffstat (limited to 'win')
| -rw-r--r-- | win/tcl.rc | 2 | ||||
| -rw-r--r-- | win/tclWinInt.h | 14 | ||||
| -rw-r--r-- | win/tclsh.rc | 2 |
3 files changed, 16 insertions, 2 deletions
@@ -2,7 +2,7 @@ // #include <winver.h> -#include <tcl.h> +#include "tclWinInt.h" // // build-up the name suffix that defines the type of build this is. diff --git a/win/tclWinInt.h b/win/tclWinInt.h index 22ad8e9..b3753f4 100644 --- a/win/tclWinInt.h +++ b/win/tclWinInt.h @@ -15,6 +15,20 @@ #include "tclInt.h" /* + * Utility macros: STRINGIFY takes an argument and wraps it in "" (double + * quotation marks), JOIN joins two arguments. + */ + +#ifndef STRINGIFY +# define STRINGIFY(x) STRINGIFY1(x) +# define STRINGIFY1(x) #x +#endif +#ifndef JOIN +# define JOIN(a,b) JOIN1(a,b) +# define JOIN1(a,b) a##b +#endif + +/* * Some versions of Borland C have a define for the OSVERSIONINFO for * Win32s and for NT, but not for Windows 95. * Define VER_PLATFORM_WIN32_CE for those without newer headers. diff --git a/win/tclsh.rc b/win/tclsh.rc index 16eaf83..6e1114d 100644 --- a/win/tclsh.rc +++ b/win/tclsh.rc @@ -2,7 +2,7 @@ // #include <winver.h> -#include <tcl.h> +#include "tclWinInt.h" // // build-up the name suffix that defines the type of build this is. |