Parameter estimate matched with appropriate variable during estimation

[pspp] / src / set.q

diff --git a/src/set.q b/src/set.q
index c7d22771ac35c2cac07cbe243940b3571a3fb250..eb0a7331023c9f11605922a00e65b342ec5cceb2 100644 (file)
--- a/src/set.q
+++ b/src/set.q
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 /*
    Categories of SET subcommands:
@@ -87,6 +87,9 @@ int tgetnum (const char *);
 #endif /* !HAVE_TERMCAP_H */
 #endif /* !HAVE_LIBTERMCAP */
 
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
 static int set_errors;
 static int set_messages;
 static int set_results;
@@ -650,7 +653,7 @@ stc_custom_epoch (struct cmd_set *cmd UNUSED)
   lex_match ('=');
   if (lex_match_id ("AUTOMATIC"))
     set_epoch = -1;
-  else if (lex_integer_p ()) 
+  else if (lex_is_integer ()) 
     {
       int new_epoch = lex_integer ();
       lex_get ();
@@ -1327,7 +1330,7 @@ get_include(void)
  return (cmd.inc != STC_OFF );
 }
 
-unsigned char
+char
 get_endcmd(void)
 {
   return cmd.s_endcmd[0];
@@ -1403,7 +1406,7 @@ set_rng (unsigned long seed)
 {
   rng = gsl_rng_alloc (gsl_rng_mt19937);
   if (rng == NULL)
-    out_of_memory ();
+    xalloc_die ();
   gsl_rng_set (rng, seed);
 }