Trims to support the removal of RESOURCE_INCLUDED from rc

	scripts	from FR #565088.

	* generic/tcl.h: moved the #ifndef RC_INVOKED start block up in
	the file.  rc scripts don't need to know thread mutexes.

	* win/tcl.rc:
	* win/tclsh.rc: removed the #define RESOURCE_INCLUDED to let the
	built-in -DRC_INVOKED to the work.

3 files changed, 15 insertions, 19 deletions

diff --git a/generic/tcl.h b/generic/tcl.h
index 85e63c1..0405cb4 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.127 2002/06/17 22:52:51 hobbs Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.128 2002/06/18 00:12:44 davygrvy Exp $
  */
 
 #ifndef _TCL
@@ -118,6 +118,16 @@ extern "C" {
 #  define JOIN1(a,b) a##b
 #endif
 
+/* 
+ * 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.
+ * Resource compilers don't like all the C stuff, like typedefs and
+ * procedure declarations, that occur below, so block them out.
+ */
+
+#ifndef RC_INVOKED
+
 /*
  * Special macro to define mutexes, that doesn't do anything
  * if we are not using threads.
@@ -143,16 +153,6 @@ extern "C" {
 #define Tcl_ConditionFinalize(condPtr)
 #endif /* TCL_THREADS */
 
-/* 
- * 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.
- * Resource compilers don't like all the C stuff, like typedefs and
- * procedure declarations, that occur below, so block them out.
- */
-
-#ifndef RC_INVOKED
-
 
 #ifndef BUFSIZ
 #   include <stdio.h>
diff --git a/win/tcl.rc b/win/tcl.rc
index 315d634..746f5dd 100644
--- a/win/tcl.rc
+++ b/win/tcl.rc
@@ -1,11 +1,9 @@
-// RCS: @(#) $Id: tcl.rc,v 1.7 2001/10/01 20:57:20 hobbs Exp $
+// RCS: @(#) $Id: tcl.rc,v 1.8 2002/06/18 00:12:24 davygrvy Exp $
 //
 // Version Resource Script
 //
 
 #include <winver.h>
-
-#define RESOURCE_INCLUDED
 #include <tcl.h>
 
 //
@@ -46,7 +44,7 @@ BEGIN
         BLOCK "040904b0" /* LANG_ENGLISH/SUBLANG_ENGLISH_US, Unicode CP */
         BEGIN
             VALUE "FileDescription", "Tcl DLL\0"
-            VALUE "OriginalFilename", "tcl" STRINGIFY(TCL_MAJOR_VERSION) STRINGIFY(TCL_MINOR_VERSION) SUFFIX ".dll\0"
+            VALUE "OriginalFilename", "tcl" STRINGIFY(JOIN(TCL_MAJOR_VERSION,TCL_MINOR_VERSION)) SUFFIX ".dll\0"
             VALUE "CompanyName", "ActiveState Corporation\0"
             VALUE "FileVersion", TCL_PATCH_LEVEL
             VALUE "LegalCopyright", "Copyright \251 2001 by ActiveState Corporation, et al\0"
diff --git a/win/tclsh.rc b/win/tclsh.rc
index 0d02804..eaa7270 100644
--- a/win/tclsh.rc
+++ b/win/tclsh.rc
@@ -1,11 +1,9 @@
-// RCS: @(#) $Id: tclsh.rc,v 1.7 2001/10/01 20:57:20 hobbs Exp $
+// RCS: @(#) $Id: tclsh.rc,v 1.8 2002/06/18 00:12:24 davygrvy Exp $
 //
 // Version Resource Script
 //
 
 #include <winver.h>
-
-#define RESOURCE_INCLUDED
 #include <tcl.h>
 
 //
@@ -52,7 +50,7 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "Tclsh Application\0"
-            VALUE "OriginalFilename", "tclsh" STRINGIFY(TCL_MAJOR_VERSION) STRINGIFY(TCL_MINOR_VERSION) SUFFIX ".exe\0"
+            VALUE "OriginalFilename", "tclsh" STRINGIFY(JOIN(TCL_MAJOR_VERSION,TCL_MINOR_VERSION)) SUFFIX ".exe\0"
             VALUE "CompanyName", "ActiveState Corporation\0"
             VALUE "FileVersion", TCL_PATCH_LEVEL
             VALUE "LegalCopyright", "Copyright \251 2000 by ActiveState Corporation, et al\0"