diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2013-01-31 12:41:37 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2013-01-31 12:41:37 (GMT) |
| commit | 134d96ef92ea28d427471030203f3210c3922fb8 (patch) | |
| tree | cb292af67bf9c892e222f9bab28866705e5d321d | |
| parent | 1c99c076845fb67d60857fddf9547de1a1daa00c (diff) | |
| parent | 5ca0b055755f8700947e4498792c5184f04f764c (diff) | |
| download | tk-134d96ef92ea28d427471030203f3210c3922fb8.zip tk-134d96ef92ea28d427471030203f3210c3922fb8.tar.gz tk-134d96ef92ea28d427471030203f3210c3922fb8.tar.bz2 | |
Merge trunk.
Define some macros in tk.h which are needed by Tk as fallback, which might be removed from future tcl.h versions.
FossilOrigin-Name: 4f65f224c4c5308c95002268dc54586b17ac13e2
| -rw-r--r-- | generic/tk.h | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/generic/tk.h b/generic/tk.h index 1594dc9..aa9cd22 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -20,7 +20,32 @@ #if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION < 6) # error Tk 8.6 must be compiled with tcl.h from Tcl 8.6 or better #endif - + +#ifndef CONST84 +# define CONST84 const +# define CONST84_RETURN const +#endif +#ifndef CONST86 +# define CONST86 CONST84 +#endif +#ifndef EXTERN +# define EXTERN extern TCL_STORAGE_CLASS +#endif + +/* + * 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 + /* * For C++ compilers, use extern "C" */ |