1 files changed, 14 insertions, 15 deletions
diff --git a/tk/mac/tkMac.h b/tk/mac/tkMac.h
index c6b3044ac84..362f6f9a3d9 100644
--- a/tk/mac/tkMac.h
+++ b/tk/mac/tkMac.h
@@ -14,17 +14,21 @@
 #ifndef _TKMAC
 #define _TKMAC
 
+#ifndef _TK
+#include <tk.h>
+#endif
+
+#ifndef _TKINT
+#include "tkInt.h"
+#endif
+
 #include <Windows.h>
 #include <QDOffscreen.h>
-#include "tkInt.h"
 
-/*
- * "export" is a MetroWerks specific pragma.  It flags the linker that  
- * any symbols that are defined when this pragma is on will be exported 
- * to shared libraries that link with this library.
- */
- 
-#pragma export on
+#ifdef BUILD_tk
+# undef TCL_STORAGE_CLASS
+# define TCL_STORAGE_CLASS DLLEXPORT
+#endif
 
 /*
  * This variable is exported and can be used by extensions.  It is the
@@ -44,14 +48,9 @@ typedef int (Tk_MacEmbedMakeContainerExistProc) (Tk_Window window);
 typedef void (Tk_MacEmbedGetClipProc) (Tk_Window window, RgnHandle rgn); 
 typedef void (Tk_MacEmbedGetOffsetInParentProc) (Tk_Window window, Point *ulCorner);
 
-/*
- * These functions are currently in tkMacInt.h.  They are just copied over here
- * so they can be exported.
- */
-
 #include "tkPlatDecls.h"
 
-#pragma export reset
+# undef TCL_STORAGE_CLASS
+# define TCL_STORAGE_CLASS DLLIMPORT
 
 #endif /* _TKMAC */
-