diff options
Diffstat (limited to 'otherlibs/labltk/support')
-rw-r--r-- | otherlibs/labltk/support/cltkDMain.c | 4 | ||||
-rw-r--r-- | otherlibs/labltk/support/cltkEval.c | 8 | ||||
-rw-r--r-- | otherlibs/labltk/support/cltkMain.c | 4 | ||||
-rw-r--r-- | otherlibs/labltk/support/cltkMisc.c | 2 | ||||
-rw-r--r-- | otherlibs/labltk/support/cltkUtf.c | 4 | ||||
-rw-r--r-- | otherlibs/labltk/support/cltkWait.c | 4 |
6 files changed, 13 insertions, 13 deletions
diff --git a/otherlibs/labltk/support/cltkDMain.c b/otherlibs/labltk/support/cltkDMain.c index 04af209de..58374d8a3 100644 --- a/otherlibs/labltk/support/cltkDMain.c +++ b/otherlibs/labltk/support/cltkDMain.c @@ -162,7 +162,7 @@ int CamlRunCmd(dummy, interp, argc, argv) + trail.symbol_size + trail.debug_size), 2); code_size = trail.code_size; - start_code = (code_t) stat_alloc(code_size); + start_code = (code_t) caml_stat_alloc(code_size); if (read(fd, (char *) start_code, code_size) != code_size) fatal_error("Fatal error: truncated bytecode file.\n"); @@ -215,7 +215,7 @@ int Caml_Init(interp) { char *home = getenv("HOME"); if (home != NULL) { - char *f = stat_alloc(strlen(home)+strlen(RCNAME)+2); + char *f = caml_stat_alloc(strlen(home)+strlen(RCNAME)+2); f[0]='\0'; strcat(f, home); strcat(f, "/"); diff --git a/otherlibs/labltk/support/cltkEval.c b/otherlibs/labltk/support/cltkEval.c index 69ba6d8a1..c7a43481c 100644 --- a/otherlibs/labltk/support/cltkEval.c +++ b/otherlibs/labltk/support/cltkEval.c @@ -139,14 +139,14 @@ int fill_args (char **argv, int where, value v) char *merged; int i; int size = argv_size(Field(v,0)); - tmpargv = (char **)stat_alloc((size + 1) * sizeof(char *)); + tmpargv = (char **)caml_stat_alloc((size + 1) * sizeof(char *)); fill_args(tmpargv,0,Field(v,0)); tmpargv[size] = NULL; merged = Tcl_Merge(size,(const char *const*)tmpargv); for(i = 0; i<size; i++){ stat_free(tmpargv[i]); } stat_free((char *)tmpargv); /* must be freed by stat_free */ - argv[where] = (char*)stat_alloc(strlen(merged)+1); + argv[where] = (char*)caml_stat_alloc(strlen(merged)+1); strcpy(argv[where], merged); Tcl_Free(merged); return (where + 1); @@ -173,8 +173,8 @@ CAMLprim value camltk_tcl_direct_eval(value v) /* +2: one slot for NULL one slot for "unknown" if command not found */ - argv = (char **)stat_alloc((size + 2) * sizeof(char *)); - allocated = (char **)stat_alloc(size * sizeof(char *)); + argv = (char **)caml_stat_alloc((size + 2) * sizeof(char *)); + allocated = (char **)caml_stat_alloc(size * sizeof(char *)); /* Copy -- argv[i] must be freed by stat_free */ { diff --git a/otherlibs/labltk/support/cltkMain.c b/otherlibs/labltk/support/cltkMain.c index 8751334c5..871a47ac1 100644 --- a/otherlibs/labltk/support/cltkMain.c +++ b/otherlibs/labltk/support/cltkMain.c @@ -113,7 +113,7 @@ CAMLprim value camltk_opentk(value argv) char **tkargv; char argcstr[256]; /* string of argc */ - tkargv = (char**)stat_alloc(sizeof( char* ) * argc ); + tkargv = (char**)caml_stat_alloc(sizeof( char* ) * argc ); tmp = Field(argv, 1); /* starts from argv[1] */ i = 0; @@ -157,7 +157,7 @@ CAMLprim value camltk_opentk(value argv) { char *home = getenv("HOME"); if (home != NULL) { - char *f = stat_alloc(strlen(home)+strlen(RCNAME)+2); + char *f = caml_stat_alloc(strlen(home)+strlen(RCNAME)+2); f[0]='\0'; strcat(f, home); strcat(f, "/"); diff --git a/otherlibs/labltk/support/cltkMisc.c b/otherlibs/labltk/support/cltkMisc.c index a89ea341f..52c5d4846 100644 --- a/otherlibs/labltk/support/cltkMisc.c +++ b/otherlibs/labltk/support/cltkMisc.c @@ -55,7 +55,7 @@ CAMLprim value camltk_splitlist (value v) char *string_to_c(value s) { int l = string_length(s); - char *res = stat_alloc(l + 1); + char *res = caml_stat_alloc(l + 1); memmove (res, String_val (s), l); res[l] = '\0'; return res; diff --git a/otherlibs/labltk/support/cltkUtf.c b/otherlibs/labltk/support/cltkUtf.c index 448e06a1c..61dbfb2f5 100644 --- a/otherlibs/labltk/support/cltkUtf.c +++ b/otherlibs/labltk/support/cltkUtf.c @@ -43,7 +43,7 @@ char *external_to_utf( char *str ){ Tcl_ExternalToUtfDString(NULL, str, strlen(str), &dstr); length = Tcl_DStringLength(&dstr); - res = stat_alloc(length + 1); + res = caml_stat_alloc(length + 1); memmove( res, Tcl_DStringValue(&dstr), length+1); Tcl_DStringFree(&dstr); @@ -57,7 +57,7 @@ char *utf_to_external( char *str ){ Tcl_UtfToExternalDString(NULL, str, strlen(str), &dstr); length = Tcl_DStringLength(&dstr); - res = stat_alloc(length + 1); + res = caml_stat_alloc(length + 1); memmove( res, Tcl_DStringValue(&dstr), length+1); Tcl_DStringFree(&dstr); diff --git a/otherlibs/labltk/support/cltkWait.c b/otherlibs/labltk/support/cltkWait.c index a46860b85..e13091f2d 100644 --- a/otherlibs/labltk/support/cltkWait.c +++ b/otherlibs/labltk/support/cltkWait.c @@ -62,7 +62,7 @@ static void WaitVisibilityProc(clientData, eventPtr) CAMLprim value camltk_wait_vis(value win, value cbid) { struct WinCBData *vis = - (struct WinCBData *)stat_alloc(sizeof(struct WinCBData)); + (struct WinCBData *)caml_stat_alloc(sizeof(struct WinCBData)); vis->win = Tk_NameToWindow(cltclinterp, String_val(win), cltk_mainWindow); if (vis -> win == NULL) { stat_free((char *)vis); @@ -89,7 +89,7 @@ static void WaitWindowProc(ClientData clientData, XEvent *eventPtr) CAMLprim value camltk_wait_des(value win, value cbid) { struct WinCBData *vis = - (struct WinCBData *)stat_alloc(sizeof(struct WinCBData)); + (struct WinCBData *)caml_stat_alloc(sizeof(struct WinCBData)); vis->win = Tk_NameToWindow(cltclinterp, String_val(win), cltk_mainWindow); if (vis -> win == NULL) { stat_free((char *)vis); |