diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | generic/tk.h | 6 | ||||
| -rw-r--r-- | win/rc/tk.rc | 10 | ||||
| -rw-r--r-- | win/rc/wish.rc | 9 |
4 files changed, 18 insertions, 18 deletions
@@ -1,3 +1,14 @@ +2002-06-17 David Gravereaux <davygrvy@pobox.com> + + Trims to support the removal of RESOURCE_INCLUDED from rc + scripts from Tcl's accepted FR #565088. + + * generic/tk.h: Changed RESOURCE_INCLUDED to be RC_INVOKED + as the RC tool defines this already by default. + + * win/rc/tk.rc: + * win/rc/wish.rc: removed the #define RESOURCE_INCLUDED lines. + 2002-06-17 Jeff Hobbs <jeffh@ActiveState.com> * unix/Makefile.in (dist): correct installation of diff --git a/generic/tk.h b/generic/tk.h index babc9bf..666d978 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tk.h,v 1.61 2002/06/14 22:25:11 jenglish Exp $ + * RCS: @(#) $Id: tk.h,v 1.62 2002/06/18 00:34:45 davygrvy Exp $ */ #ifndef _TK @@ -73,7 +73,7 @@ extern "C" { * in resource files. */ -#ifndef RESOURCE_INCLUDED +#ifndef RC_INVOKED #ifndef _XLIB_H # ifdef MAC_TCL @@ -1512,7 +1512,7 @@ typedef int (Tk_SelectionProc) _ANSI_ARGS_((ClientData clientData, */ -#endif /* RESOURCE_INCLUDED */ +#endif /* RC_INVOKED */ #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT diff --git a/win/rc/tk.rc b/win/rc/tk.rc index bdca9cd..ff234be 100644 --- a/win/rc/tk.rc +++ b/win/rc/tk.rc @@ -1,17 +1,11 @@ -// RCS: @(#) $Id: tk.rc,v 1.8 2001/11/10 00:58:51 hobbs Exp $ +// RCS: @(#) $Id: tk.rc,v 1.9 2002/06/18 00:34:45 davygrvy Exp $ // // Version Resource Script // #include <windows.h> - -#define RESOURCE_INCLUDED #include <tk.h> -#define STRINGIFY1(x) #x -#define STRINGIFY(x) STRINGIFY1(x) - - // // build-up the name suffix that defines the type of build this is. // @@ -48,7 +42,7 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "Tk DLL\0" - VALUE "OriginalFilename", "tk" STRINGIFY(TK_MAJOR_VERSION) STRINGIFY(TK_MINOR_VERSION) SUFFIX ".dll\0" + VALUE "OriginalFilename", "tk" STRINGIFY(JOIN(TK_MAJOR_VERSION,TK_MINOR_VERSION)) SUFFIX ".dll\0" VALUE "CompanyName", "ActiveState Corporation\0" VALUE "FileVersion", TK_PATCH_LEVEL VALUE "LegalCopyright", "Copyright \251 2001 by ActiveState Corporation, et al\0" diff --git a/win/rc/wish.rc b/win/rc/wish.rc index d10a200..4a1eb99 100644 --- a/win/rc/wish.rc +++ b/win/rc/wish.rc @@ -1,16 +1,11 @@ -// RCS: @(#) $Id: wish.rc,v 1.7 2001/11/10 00:58:51 hobbs Exp $ +// RCS: @(#) $Id: wish.rc,v 1.8 2002/06/18 00:34:45 davygrvy Exp $ // // Version Resource Script // #include <windows.h> - -#define RESOURCE_INCLUDED #include <tk.h> -#define STRINGIFY1(x) #x -#define STRINGIFY(x) STRINGIFY1(x) - // // build-up the name suffix that defines the type of build this is. // @@ -53,7 +48,7 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "Wish Application\0" - VALUE "OriginalFilename", "wish" STRINGIFY(TK_MAJOR_VERSION) STRINGIFY(TK_MINOR_VERSION) SUFFIX ".exe\0" + VALUE "OriginalFilename", "wish" STRINGIFY(JOIN(TK_MAJOR_VERSION,TK_MINOR_VERSION)) SUFFIX ".exe\0" VALUE "CompanyName", "ActiveState Corporation\0" VALUE "FileVersion", TK_PATCH_LEVEL VALUE "LegalCopyright", "Copyright \251 2000 by ActiveState Corporation, et al\0" |