diff options
| author | escoffon <escoffon> | 1998-07-01 19:08:21 (GMT) |
|---|---|---|
| committer | escoffon <escoffon> | 1998-07-01 19:08:21 (GMT) |
| commit | ee77e83f0be4a17dede324b514b611c4db8b60ad (patch) | |
| tree | 3f17ff710b2f551cdac37c439b2fd217437261e3 /generic/tcl.h | |
| parent | 43a575cb60322a2ae136dfc2be6167f5d66b7390 (diff) | |
| download | tcl-ee77e83f0be4a17dede324b514b611c4db8b60ad.zip tcl-ee77e83f0be4a17dede324b514b611c4db8b60ad.tar.gz tcl-ee77e83f0be4a17dede324b514b611c4db8b60ad.tar.bz2 | |
Merged changes between child workspace "/home/escoffon/ws/tcl8.0" and
parent workspace "/ws/tcl8.0".
Diffstat (limited to 'generic/tcl.h')
| -rw-r--r-- | generic/tcl.h | 34 |
1 files changed, 29 insertions, 5 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index 77719ee..d9fa893 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: %Z% $Id: tcl.h,v 1.7 1998/06/29 18:08:50 welch Exp $ + * SCCS: %Z% $Id: tcl.h,v 1.8 1998/07/01 19:08:21 escoffon Exp $ */ #ifndef _TCL @@ -70,10 +70,6 @@ # ifndef USE_TCLALLOC # define USE_TCLALLOC 1 # endif -# ifndef STRINGIFY -# define STRINGIFY(x) STRINGIFY1(x) -# define STRINGIFY1(x) #x -# endif #endif /* __WIN32__ */ /* @@ -93,6 +89,34 @@ # endif #endif +/* + * Utility macros: STRINGIFY takes an argument and wraps it in "" (double + * quotation marks), JOIN joins two arguments. + */ + +#define VERBATIM(x) x +#ifdef _MSC_VER +# define STRINGIFY(x) STRINGIFY1(x) +# define STRINGIFY1(x) #x +# define JOIN(a,b) JOIN1(a,b) +# define JOIN1(a,b) a##b +#else +# ifdef RESOURCE_INCLUDED +# define STRINGIFY(x) STRINGIFY1(x) +# define STRINGIFY1(x) #x +# define JOIN(a,b) JOIN1(a,b) +# define JOIN1(a,b) a##b +# else +# ifdef __STDC__ +# define STRINGIFY(x) #x +# define JOIN(a,b) a##b +# else +# define STRINGIFY(x) "x" +# define JOIN(a,b) VERBATIM(a)VERBATIM(b) +# endif +# endif +#endif + /* * A special definition used to allow this header file to be included * in resource files so that they can get obtain version information from |