← Back to branch summary

~ubuntu-branches/debian/sid/ocaml/sid

« back to all changes in this revision

Viewing changes to otherlibs/labltk/support/cltkMisc.c

  • Committer: Bazaar Package Importer
  • Author(s): Stéphane Glondu
  • Date: 2011-04-21 21:35:08 UTC
  • mfrom: (1.1.11 upstream) (12.1.14 sid)
  • Revision ID: james.westby@ubuntu.com-20110421213508-kg34453aqmb0moha
* Fixes related to -output-obj with g++ (in debian/patches):
  - add Declare-primitive-name-table-as-const-char
  - add Avoid-multiple-declarations-in-generated-.c-files-in
  - fix Embed-bytecode-in-C-object-when-using-custom: the closing
    brace for extern "C" { ... } was missing in some cases

Show diffs side-by-side

added added

removed removed

Lines of Context:
otherlibs/labltk/support/cltkMisc.c
14
14
/*                                                                     */
15
15
/***********************************************************************/
16
16
 
17
 
/* $Id: cltkMisc.c 5029 2002-07-23 14:12:03Z doligez $ */
 
17
/* $Id: cltkMisc.c 10230 2010-04-03 06:43:51Z furuse $ */
18
18
 
19
19
#include <string.h>
20
20
#include <tcl.h>
33
33
 
34
34
  CheckInit();
35
35
 
36
 
  utf = caml_string_to_tcl(v); 
 
36
  utf = caml_string_to_tcl(v);
37
37
  /* argv is allocated by Tcl, to be freed by us */
38
38
  result = Tcl_SplitList(cltclinterp,utf,&argc,&argv);
39
39
  switch(result) {
47
47
  case TCL_ERROR:
48
48
  default:
49
49
    stat_free( utf );
50
 
    tk_error(cltclinterp->result);
 
50
    tk_error(Tcl_GetStringResult(cltclinterp));
51
51
  }
52
52
}
53
53
 
60
60
  res[l] = '\0';
61
61
  return res;
62
62
}
63
 
 
64