The R Project SVN – R – Diff – /branches/R-NaString/src/modules/X11/dataentry.c

 	    SET_STRING_ELT(tvec, j, STRING_ELT(ssNA_STRING, 0));
     SETLEVELS(tvec, 0);
     return (tvec);
+}
+static void closewin_cend(void *data)
+{
+    closewin();
+}
 SEXP RX11_dataentry(SEXP call, SEXP op, SEXP args, SEXP rho)
+{
     SEXP tvec2, tvec, colmodes, indata;
     SEXPTYPE type;
     int i, j,len, nprotect, tmp;
 	errorcall(call, "invalid device");
     /* set up a context which will close the window if there is an error */
     begincontext(&cntxt, CTXT_CCODE, R_NilValue, R_NilValue, R_NilValue,
 		 R_NilValue);
-    cntxt.cend = &closewin;
+    cntxt.cend = &closewin_cend;
+    cntxt.cenddata = NULL;
     highlightrect();
     eventloop();

The R Project SVN R