diff options
| author | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2004-08-01 21:44:34 +0000 |
|---|---|---|
| committer | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2004-08-01 21:44:34 +0000 |
| commit | 4e51da5eca5a86051ae3bf4f3354d59cc39ea95a (patch) | |
| tree | 5802d9fb96f58e51617d8c0637ed09193b65fa93 | |
| parent | 25a48b40c920ca62d7f05799e7a99f249d8714ec (diff) | |
| download | mdk-4e51da5eca5a86051ae3bf4f3354d59cc39ea95a.tar.gz mdk-4e51da5eca5a86051ae3bf4f3354d59cc39ea95a.tar.bz2 | |
* mixutils/mixvm_command.c (init_dis_):
* mixgtk/mixgtk_cmd_dispatcher.c (read_config_): -g option not
needed by mixasm.
(mixgtk_cmd_dispatcher_init): do not redirect stderr to the
command log windows.
| -rw-r--r-- | mixgtk/mixgtk_cmd_dispatcher.c | 6 | ||||
| -rw-r--r-- | mixutils/mixvm_command.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mixgtk/mixgtk_cmd_dispatcher.c b/mixgtk/mixgtk_cmd_dispatcher.c index 18f4600..a941627 100644 --- a/mixgtk/mixgtk_cmd_dispatcher.c +++ b/mixgtk/mixgtk_cmd_dispatcher.c @@ -1,7 +1,7 @@ /* -*-c-*- -------------- mixgtk_cmd_dispatcher.c : * Implementation of the functions declared in mixgtk_cmd_dispatcher.h * ------------------------------------------------------------------ - * $Id: mixgtk_cmd_dispatcher.c,v 1.21 2004/07/10 23:34:25 jao Exp $ + * $Id: mixgtk_cmd_dispatcher.c,v 1.22 2004/08/01 21:44:34 jao Exp $ * ------------------------------------------------------------------ * Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc. * @@ -248,7 +248,7 @@ read_config_ (void) { mix_vm_cmd_dispatcher_set_editor (dis_data_.dispatcher, editor); } - if (!assem) assem = "mixasm -g %s"; + if (!assem) assem = "mixasm %s"; mix_vm_cmd_dispatcher_set_assembler (dis_data_.dispatcher, assem); } @@ -333,7 +333,7 @@ mixgtk_cmd_dispatcher_init (mixgtk_dialog_id_t top) g_return_val_if_fail (r == 0, FALSE); /* connect stdout/stderr to the pipe's write end */ if (dup2 (dis_data_.fildes[1], STDOUT_FILENO) == -1 - || dup2 (dis_data_.fildes[1], STDERR_FILENO) == -1) + || dup2 (dis_data_.fildes[1], STDOUT_FILENO) == -1) return FALSE; dis_data_.out = fdopen (dis_data_.fildes[1], "w"); g_return_val_if_fail (dis_data_.out != NULL, FALSE); diff --git a/mixutils/mixvm_command.c b/mixutils/mixvm_command.c index 4e5659a..186e885 100644 --- a/mixutils/mixvm_command.c +++ b/mixutils/mixvm_command.c @@ -1,9 +1,9 @@ /* -*-c-*- -------------- mixvm_command.c : * Implementation of the functions declared in mixvm_command.h * ------------------------------------------------------------------ - * $Id: mixvm_command.c,v 1.10 2004/06/09 12:59:42 jao Exp $ + * $Id: mixvm_command.c,v 1.11 2004/08/01 21:44:34 jao Exp $ * ------------------------------------------------------------------ - * Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. + * Copyright (C) 2000, 2001, 2002, 2004 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 @@ -208,7 +208,7 @@ init_dis_ (mix_vm_cmd_dispatcher_t *dis) edit = g_strconcat (editor, " %s", NULL); mix_vm_cmd_dispatcher_set_editor (dis, edit); g_free (edit); - mix_vm_cmd_dispatcher_set_assembler (dis, "mixasm -g %s"); + mix_vm_cmd_dispatcher_set_assembler (dis, "mixasm %s"); } mix_vm_cmd_dispatcher_t * |