Index: tcl.h =================================================================== RCS file: /cvsroot/tcl/tcl/generic/tcl.h,v retrieving revision 1.103 diff -c -r1.103 tcl.h *** tcl.h 2001/09/28 01:21:53 1.103 --- tcl.h 2001/10/04 19:34:49 *************** *** 123,129 **** # define JOIN(a,b) JOIN1(a,b) # define JOIN1(a,b) a##b #else ! # ifdef RESOURCE_INCLUDED # define STRINGIFY(x) STRINGIFY1(x) # define STRINGIFY1(x) #x # define JOIN(a,b) JOIN1(a,b) --- 123,129 ---- # define JOIN(a,b) JOIN1(a,b) # define JOIN1(a,b) a##b #else ! # ifdef RC_INVOKED # define STRINGIFY(x) STRINGIFY1(x) # define STRINGIFY1(x) #x # define JOIN(a,b) JOIN1(a,b) *************** *** 139,144 **** --- 139,154 ---- # endif #endif + /* + * A special definition used to allow this header file to be included in + * resource files so that they can obtain version information from this file. + * 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. + */ + + #ifndef RC_INVOKED + /* * Special macro to define mutexes, that doesn't do anything * if we are not using threads. *************** *** 164,178 **** #define Tcl_ConditionFinalize(condPtr) #endif /* TCL_THREADS */ - /* - * A special definition 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 - #ifndef BUFSIZ #include #endif --- 174,179 ---- *************** *** 2163,2172 **** EXTERN int Tcl_AppInit _ANSI_ARGS_((Tcl_Interp *interp)); - #endif /* RESOURCE_INCLUDED */ - #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT /* * end block for C++ --- 2164,2173 ---- EXTERN int Tcl_AppInit _ANSI_ARGS_((Tcl_Interp *interp)); #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT + + #endif /* RC_INVOKED */ /* * end block for C++