diff options
Diffstat (limited to 'mixlib')
| -rw-r--r-- | mixlib/mix_scanner.l | 44 | ||||
| -rw-r--r-- | mixlib/mix_vm_command.c | 6 |
2 files changed, 27 insertions, 23 deletions
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); |