summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordas <das>2002-09-12 17:33:19 (GMT)
committerdas <das>2002-09-12 17:33:19 (GMT)
commit84bbc0ca20531d25fea737aaccf2202e35a84ca2 (patch)
treea2cb0a968159ab36f7acc7eacc94e985c4085c49 /generic
parent2df9ddec36fa63a36a21e253b3951b78c42b7694 (diff)
downloadtcl-84bbc0ca20531d25fea737aaccf2202e35a84ca2.zip
tcl-84bbc0ca20531d25fea737aaccf2202e35a84ca2.tar.gz
tcl-84bbc0ca20531d25fea737aaccf2202e35a84ca2.tar.bz2
* 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.
Diffstat (limited to 'generic')
-rw-r--r--generic/tcl.h22
1 files changed, 6 insertions, 16 deletions
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++