From fc3107590c2c997e544f82ca92c5ef14152979db Mon Sep 17 00:00:00 2001 From: rlar Date: Sat, 2 Jul 2011 20:21:15 +0000 Subject: [PATCH] main.c, ft_nutmeg is a const global bool --- src/main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main.c b/src/main.c index 405e51737..2dd223c37 100644 --- a/src/main.c +++ b/src/main.c @@ -197,7 +197,7 @@ extern IFsimulator SIMinfo; #ifdef SIMULATOR -bool ft_nutmeg = FALSE; +const bool ft_nutmeg = FALSE; extern struct comm spcp_coms[ ]; struct comm *cp_coms = spcp_coms; @@ -232,7 +232,7 @@ IFfrontEnd nutmeginfo = { #else /* SIMULATOR */ -bool ft_nutmeg = TRUE; +const bool ft_nutmeg = TRUE; extern struct comm nutcp_coms[ ]; struct comm *cp_coms = nutcp_coms; IFfrontEnd nutmeginfo; @@ -1155,7 +1155,7 @@ main(int argc, char **argv) } #endif - if (!ft_servermode && !ft_nutmeg) { + if (!ft_servermode) { /* Concatenate all non-option arguments into a temporary file and load that file into the spice core. @@ -1252,9 +1252,9 @@ main(int argc, char **argv) if (ft_batchmode && err) sp_shutdown(EXIT_BAD); - } /* --- if (!ft_servermode && !ft_nutmeg) --- */ + } /* --- if (!ft_servermode) --- */ - if (!gotone && ft_batchmode && !ft_nutmeg) + if (!gotone && ft_batchmode) inp_spsource(circuit_file, FALSE, NULL); } @@ -1318,7 +1318,7 @@ main(int argc, char **argv) cp_interactive = FALSE; err = 0; - if (ft_nutmeg && gdata) { + if (gdata) { if (optind < argc) while (optind < argc) ft_loadfile(argv[optind++]);