3 files changed, 9 insertions, 9 deletions
diff --git a/otherlibs/labltk/support/Makefile.nt b/otherlibs/labltk/support/Makefile.nt
index 0bb6535d1..e1720efb4 100644
--- a/otherlibs/labltk/support/Makefile.nt
+++ b/otherlibs/labltk/support/Makefile.nt
@@ -13,7 +13,7 @@ COBJS=cltkCaml.o cltkUtf.o cltkEval.o cltkEvent.o cltkFile.o \
 DCOBJS=$(COBJS:.o=.$(DO))
 SCOBJS=$(COBJS:.o=.$(SO))
 
-CCFLAGS=-I../../../byterun -I../../win32unix $(TK_DEFS)
+CCFLAGS=-I../../../byterun -I../../win32unix $(TK_DEFS) -DIN_CAMLTKSUPPORT
 
 COMPFLAGS=-I $(OTHERS)/win32unix
 
diff --git a/otherlibs/labltk/support/camltk.h b/otherlibs/labltk/support/camltk.h
index 44354076a..deba33086 100644
--- a/otherlibs/labltk/support/camltk.h
+++ b/otherlibs/labltk/support/camltk.h
@@ -16,6 +16,12 @@
 
 /* $Id$ */
 
+#if defined(_WIN32) && defined(CAML_DLL) && defined(IN_CAMLTKSUPPORT)
+#define CAMLTKextern CAMLexport
+#else
+#define CAMLTKextern CAMLextern
+#endif
+
 /* cltkMisc.c */
 /* copy a Caml string to the C heap. Must be deallocated with stat_free */
 extern char *string_to_c(value s);
@@ -25,8 +31,7 @@ extern value tcl_string_to_caml( char * );
 extern char * caml_string_to_tcl( value );
 
 /* cltkEval.c */
-extern Tcl_Interp *cltclinterp; /* The Tcl interpretor */
-extern Tcl_Interp * get_cltclinterp(void);
+CAMLTKextern Tcl_Interp *cltclinterp; /* The Tcl interpretor */
 extern value copy_string_list(int argc, char ** argv);
 
 /* cltkCaml.c */
@@ -35,7 +40,7 @@ extern value *tkerror_exn;
 extern value *handler_code;
 extern int CamlCBCmd(ClientData clientdata, Tcl_Interp *interp,
                      int argc, char *argv[]);
-extern void tk_error(char * errmsg) Noreturn;
+CAMLTKextern void tk_error(char * errmsg) Noreturn;
 
 /* cltkMain.c */
 extern int signal_events;
diff --git a/otherlibs/labltk/support/cltkEval.c b/otherlibs/labltk/support/cltkEval.c
index 5c9aeac12..b31bc1adf 100644
--- a/otherlibs/labltk/support/cltkEval.c
+++ b/otherlibs/labltk/support/cltkEval.c
@@ -32,11 +32,6 @@
 /* The Tcl interpretor */
 Tcl_Interp *cltclinterp = NULL;
 
-CAMLexport Tcl_Interp * get_cltclinterp(void)
-{
-  return cltclinterp;
-}
-
 /* Copy a list of strings from the C heap to Caml */
 value copy_string_list(int argc, char **argv)
 {