fix a tcl callback issue

jiahao · Sep 23, 2012 · 7235170 · 7235170
1 parent ea478f1
commit 7235170
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/deps/Makefile b/deps/Makefile
@@ -924,7 +924,7 @@ distclean-zlib:
 
 ## Tk wrapper ##
 
-TKW_INC = -I $(USRINC) -I $(JULIAHOME)/src -I $(JULIAHOME)/src/support
+TKW_INC = -I $(USRINC) -I /usr/include/tcl -I $(JULIAHOME)/src -I $(JULIAHOME)/src/support
 TKW_LIB = -ltcl8.5 -ltk8.5 -L$(USRLIB)/ -ljulia-release
 
 $(USRLIB)/libtk_wrapper.$(SHLIB_EXT): tk_wrapper.c

diff --git a/deps/tk_wrapper.c b/deps/tk_wrapper.c
@@ -23,7 +23,10 @@ int jl_tcl_callback(ClientData clientData, Tcl_Interp *interp,
  JL_GC_POP();
  return TCL_ERROR;
  }
- Tcl_SetResult(interp, jl_string_data(result), TCL_VOLATILE);
+ if (jl_is_byte_string(result))
+ Tcl_SetResult(interp, jl_string_data(result), TCL_VOLATILE);
+ else
+ Tcl_SetResult(interp, "", TCL_STATIC);
  JL_GC_POP();
  return TCL_OK;
 }

diff --git a/src/julia.expmap b/src/julia.expmap
@@ -87,6 +87,8 @@
  jl_exception_in_transit;
  jl_expand;
  jl_expr_type;
+ jl_ascii_string_type;
+ jl_utf8_string_type;
  jl_fd_clr;
  jl_fd_isset;
  jl_fd_set;

diff --git a/src/julia.h b/src/julia.h
@@ -359,8 +359,8 @@ extern jl_tag_type_t *jl_abstractarray_type;
 extern jl_struct_type_t *jl_array_type;
 extern jl_typename_t *jl_array_typename;
 extern jl_struct_type_t *jl_weakref_type;
-extern jl_struct_type_t *jl_ascii_string_type;
-extern jl_struct_type_t *jl_utf8_string_type;
+extern DLLEXPORT jl_struct_type_t *jl_ascii_string_type;
+extern DLLEXPORT jl_struct_type_t *jl_utf8_string_type;
 extern DLLEXPORT jl_struct_type_t *jl_errorexception_type;
 extern jl_struct_type_t *jl_typeerror_type;
 extern DLLEXPORT jl_struct_type_t *jl_loaderror_type;