Compilation warnings fixed.

git-archimport-id: mdk@sv.gnu.org/mdk--devel--1--patch-5

4 files changed, 91 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index e69de29..3182ec1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,62 @@
+# do not edit -- automatically generated by arch changelog
+# non-id: automatic-ChangeLog--mdk@sv.gnu.org/mdk--devel--1
+#
+
+2006-03-21 00:36:41 GMT	Jose Antonio Ortega Ruiz <jao@gnu.org>	patch-4
+
+    Summary:
+      Arch inventory files added
+    Revision:
+      mdk--devel--1--patch-4
+
+
+
+2006-03-20 23:01:19 GMT	Jose Antonio Ortega Ruiz <jao@gnu.org>	patch-3
+
+    Summary:
+      Bug fixes for 1.2.2 (latest CVS version)
+    Revision:
+      mdk--devel--1--patch-3
+
+    * mixgtk/mixgtk.glade (Module): I1 and I2 in mixvm swapped to their
+    correct position (closes #15746).
+    
+    * mixgtk/mixgtk_mixvm.c (init_mem_): fixed segfault when clicking Memory
+    title bar (closes #15910).
+    
+    * configure.in: obsolete C flags for Darwin deleted.
+    
+    * misc/mixal-mode.el (Module): sync with Emacs CVS (Pieter).
+    
+    * mixlib/mix.c: copyright year in console message updated.
+    
+    * mixgtk/mixgtk_device.c (write_char_): buffer size was insufficient.
+
+
+2006-03-20 22:55:51 GMT	Jose Antonio Ortega Ruiz <jao@gnu.org>	patch-2
+
+    Summary:
+      Trivial changes to tag rel--1.2--patch-1
+    Revision:
+      mdk--devel--1--patch-2
+
+
+
+2006-03-20 22:46:46 GMT	Jose Antonio Ortega Ruiz <jao@gnu.org>	patch-1
+
+    Summary:
+      Version 1.2.1 imported
+    Revision:
+      mdk--devel--1--patch-1
+
+
+
+2006-03-20 20:47:57 GMT	Jose Antonio Ortega Ruiz <jao@gnu.org>	base-0
+
+    Summary:
+      Archive creation
+    Revision:
+      mdk--devel--1--base-0
+
+
+
diff --git a/mixlib/mix_scanner.l b/mixlib/mix_scanner.l
index 6150007..82b860e 100644
--- a/mixlib/mix_scanner.l
+++ b/mixlib/mix_scanner.l
@@ -1,7 +1,7 @@
 /* -*-c-*- -------------- mix_scanner.l :
  * Lexical scanner used by mix_parser_t
  * ------------------------------------------------------------------
- * Copyright (C) 2000, 2003, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2000, 2003, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -71,19 +71,19 @@
   } while (FALSE)
 
 
-#define ENTER_EVAL()				\
-  do {						\
-    if (yytext[0] != '*')                       \
-      {                                         \
-        expr_val = MIX_WORD_ZERO;		\
-        yyless (0);				\
-      }                                         \
-    else                                        \
-      {                                         \
-        expr_val = mix_short_to_word_fast (parser->loc_count); \
-	yyless (1);                             \
-      }                                         \
-    yy_push_state (EVAL);			\
+#define ENTER_EVAL()                                            \
+  do {                                                          \
+    if (yytext[0] != '*')                                       \
+      {                                                         \
+        expr_val = MIX_WORD_ZERO;                               \
+        yyless (0);                                             \
+      }                                                         \
+    else                                                        \
+      {                                                         \
+        expr_val = mix_short_to_word_fast (parser->loc_count);  \
+	yyless (1);                                             \
+      }                                                         \
+    yy_push_state (EVAL);                                       \
   } while (FALSE)
 
 #define ENTER_WEVAL(s)				\
@@ -95,14 +95,14 @@
     yy_push_state (WEVAL);			\
   } while (FALSE)
 
-#define RETURN_ERROR(error, comment)				\
-  do {								\
-    char c;							\
-    mix_parser_log_error (parser,error,lineno,comment,FALSE);	\
-    while ( (c = input ()) != '\n' && c != EOF ) ;		\
-    if ( c == EOF ) return error; else ++lineno;		\
-    RESET ();							\
-    BEGIN (INITIAL);						\
+#define RETURN_ERROR(error, comment)                                    \
+  do {                                                                  \
+    int c;                                                              \
+    mix_parser_log_error (parser, error, lineno, comment, FALSE);	\
+    while ( (c = input ()) != '\n' && c != EOF ) ;                      \
+    if ( c == EOF ) return error; else ++lineno;                        \
+    RESET ();                                                           \
+    BEGIN (INITIAL);                                                    \
   } while (FALSE)
 
 
diff --git a/mixlib/mix_vm_command.c b/mixlib/mix_vm_command.c
index 350dae5..a038e40 100644
--- a/mixlib/mix_vm_command.c
+++ b/mixlib/mix_vm_command.c
@@ -3,7 +3,7 @@
  * ------------------------------------------------------------------
  * $Id: mix_vm_command.c,v 1.30 2005/09/20 19:43:13 jao Exp $
  * ------------------------------------------------------------------
- * Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -155,7 +155,9 @@ mix_vm_cmd_dispatcher_new_with_config (FILE *out, FILE *err,
   mix_vm_cmd_dispatcher_t *result = mix_vm_cmd_dispatcher_new (out, err);
   if (result != NULL && (result->config = config) != NULL)
     {
+#ifdef HAVE_LIBHISTORY
       gint hsize = 0;
+#endif
       const gchar *val = mix_config_get (result->config, TRACING_KEY_);
       if (val) cmd_strace_ (result, val);
       val = mix_config_get (result->config, EDITOR_KEY_);
@@ -219,7 +221,9 @@ del_hook_list_ (GSList *s)
 void
 mix_vm_cmd_dispatcher_delete (mix_vm_cmd_dispatcher_t *dis)
 {
+#ifdef HAVE_LIBHISTORY
   const gchar *hfile = NULL;
+#endif
   gint k;
 
   g_return_if_fail (dis != NULL);
diff --git a/mixutils/mixvm_command.c b/mixutils/mixvm_command.c
index 0fbe1ce..ec3fd6c 100644
--- a/mixutils/mixvm_command.c
+++ b/mixutils/mixvm_command.c
@@ -1,9 +1,7 @@
 /* -*-c-*- -------------- mixvm_command.c :
  * Implementation of the functions declared in mixvm_command.h
  * ------------------------------------------------------------------
- * $Id: mixvm_command.c,v 1.12 2005/09/20 19:43:13 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2000, 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,6 +24,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
+#include <string.h>
 
 #include <mixlib/mix.h>