diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | generic/tcl.h | 22 | ||||
| -rw-r--r-- | mac/tclMacApplication.r | 4 | ||||
| -rw-r--r-- | mac/tclMacLibrary.r | 4 | ||||
| -rw-r--r-- | mac/tclMacResource.r | 4 |
5 files changed, 21 insertions, 22 deletions
@@ -1,3 +1,12 @@ +2002-09-12 Daniel Steffen <das@users.sourceforge.net> + + * generic/tcl.h: + * mac/tclMacApplication.r: + * mac/tclMacLibrary.r: + * mac/tclMacResource.r: unified use of the two equivalent + resource compiler header inclusion defines RC_INVOKED and + RESOURCE_INCLUDED, now use RC_INVOKED throughout. + 2002-09-10 Mo DeJong <mdejong@users.sourceforge.net> * unix/README: Add note about building extensions diff --git a/generic/tcl.h b/generic/tcl.h index 249aa8b..f16d84a 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tcl.h,v 1.142 2002/09/02 20:10:59 hobbs Exp $ + * RCS: @(#) $Id: tcl.h,v 1.143 2002/09/12 17:33:20 das Exp $ */ #ifndef _TCL @@ -117,24 +117,16 @@ extern "C" { /* * A special definition used to allow this header file to be included - * from windows resource files so that they can obtain version - * information. RC_INVOKED is defined by default by the RC tool. + * from windows or mac resource files so that they can obtain version + * information. RC_INVOKED is defined by default by the windows RC tool + * and manually set for macintosh. + * * Resource compilers don't like all the C stuff, like typedefs and * procedure declarations, that occur below, so block them out. */ #ifndef RC_INVOKED -/* - * A special definition for Macintosh used to allow this header file - * to be included in resource files so that they can get obtain - * version information from this file. Resource compilers don't like - * all the C stuff, like typedefs and procedure declarations, that - * occur below. -*/ - -#ifndef RESOURCE_INCLUDED - /* * Special macro to define mutexes, that doesn't do anything * if we are not using threads. @@ -2282,12 +2274,10 @@ EXTERN void Tcl_Main _ANSI_ARGS_((int argc, char **argv, EXTERN int Tcl_AppInit _ANSI_ARGS_((Tcl_Interp *interp)); -#endif /* RC_INVOKED */ - #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT -#endif /* RESOURCE_INCLUDED */ +#endif /* RC_INVOKED */ /* * end block for C++ diff --git a/mac/tclMacApplication.r b/mac/tclMacApplication.r index b848da1..280c4ad 100644 --- a/mac/tclMacApplication.r +++ b/mac/tclMacApplication.r @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclMacApplication.r,v 1.5 2001/12/27 22:46:15 das Exp $ + * RCS: @(#) $Id: tclMacApplication.r,v 1.6 2002/09/12 17:33:20 das Exp $ */ #include <Types.r> @@ -21,7 +21,7 @@ * the version string for Tcl. */ -#define RESOURCE_INCLUDED +#define RC_INVOKED #include "tcl.h" #if (TCL_RELEASE_LEVEL == 0) diff --git a/mac/tclMacLibrary.r b/mac/tclMacLibrary.r index 8aa8c25..5fd1cbe 100644 --- a/mac/tclMacLibrary.r +++ b/mac/tclMacLibrary.r @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclMacLibrary.r,v 1.6 2001/12/27 22:46:22 das Exp $ + * RCS: @(#) $Id: tclMacLibrary.r,v 1.7 2002/09/12 17:33:20 das Exp $ */ #include <Types.r> @@ -21,7 +21,7 @@ * the version string for Tcl. */ -#define RESOURCE_INCLUDED +#define RC_INVOKED #include "tcl.h" #if (TCL_RELEASE_LEVEL == 0) diff --git a/mac/tclMacResource.r b/mac/tclMacResource.r index 3cb9d88..664b715 100644 --- a/mac/tclMacResource.r +++ b/mac/tclMacResource.r @@ -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: tclMacResource.r,v 1.7 2002/04/23 14:26:42 das Exp $ + * RCS: @(#) $Id: tclMacResource.r,v 1.8 2002/09/12 17:33:20 das Exp $ */ #include <Types.r> @@ -23,7 +23,7 @@ * the version string for Tcl. */ -#define RESOURCE_INCLUDED +#define RC_INVOKED #include "tcl.h" /* |