X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=perl-module%2FPSPP.xs;fp=perl-module%2FPSPP.xs;h=0b7dce1ddf04e4e553b26c248ac1b97c7992ce3e;hb=82fdcfb75eaf575336796308c22f969a6e5257fa;hp=aaa4299f0379f3823f66c765767f986081ceb038;hpb=a9f4087b58091cb01ea08e70564e0618c9182a11;p=pspp

diff --git a/perl-module/PSPP.xs b/perl-module/PSPP.xs
index aaa4299f03..0b7dce1ddf 100644
--- a/perl-module/PSPP.xs
+++ b/perl-module/PSPP.xs
@@ -157,7 +157,7 @@ value_to_scalar (const union value *val, const struct variable *var)
   else
     {
       int width = var_get_width (var);
-      return newSVpvn (val->s, width);
+      return newSVpvn ((char *) val->s, width);
     }
 }
 
@@ -208,7 +208,8 @@ CODE:
  assert (0 == strncmp (ver, bare_version, strlen (ver)));
 
  i18n_init ();
- msg_set_handler (message_handler, NULL);
+const struct msg_handler mh = { .output_msg = message_handler };
+ msg_set_handler (&mh);
  settings_init ();
  fh_init ();
 
@@ -785,7 +786,7 @@ get_case_cnt (sfr)
  struct sysreader_info *sfr;
 CODE:
  SV *ret;
- casenumber n = casereader_get_case_cnt (sfr->reader);
+ casenumber n = casereader_get_n_cases (sfr->reader);
  if (n == CASENUMBER_MAX)
   ret = &PL_sv_undef;
  else