summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorescoffon <escoffon>1998-07-21 15:25:42 (GMT)
committerescoffon <escoffon>1998-07-21 15:25:42 (GMT)
commitbdc74a471aa0644cdb55f70d1f751b360f70d543 (patch)
tree4c20defe18daa071eded92cbee3c9498b650563b /generic
parent78fb54b92486e46f62c08bf7c5cffc643630c161 (diff)
downloadtcl-bdc74a471aa0644cdb55f70d1f751b360f70d543.zip
tcl-bdc74a471aa0644cdb55f70d1f751b360f70d543.tar.gz
tcl-bdc74a471aa0644cdb55f70d1f751b360f70d543.tar.bz2
Merged changes between child workspace "/home/escoffon/ws/tcl8.0" and
parent workspace "/export/home/ws/tcl8.0".
Diffstat (limited to 'generic')
-rw-r--r--generic/tcl.h20
1 files changed, 12 insertions, 8 deletions
diff --git a/generic/tcl.h b/generic/tcl.h
index db9339a..fb5fc94 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * SCCS: %Z% $Id: tcl.h,v 1.11 1998/07/20 16:54:16 welch Exp $
+ * SCCS: %Z% $Id: tcl.h,v 1.12 1998/07/21 15:25:42 escoffon Exp $
*/
#ifndef _TCL
@@ -209,15 +209,19 @@ typedef long LONG;
* Used by windows, maps to a simple declaration on non-windows systems
*/
#ifdef __WIN32__
-# if defined(_MSC_VER)
-# define EXPORT(a,b) __declspec(dllexport) a b
+# ifdef STATIC_BUILD
+# define EXPORT(a,b) a b
+# else
+# if defined(_MSC_VER)
+# define EXPORT(a,b) __declspec(dllexport) a b
+# else
+# if defined(__BORLANDC__)
+# define EXPORT(a,b) a _export b
# else
-# if defined(__BORLANDC__)
-# define EXPORT(a,b) a _export b
-# else
-# define EXPORT(a,b) a b
-# endif
+# define EXPORT(a,b) a b
# endif
+# endif
+# endif
#else
# define EXPORT(a,b) a b
#endif