Merge branch 'pre-master' of ssh://git.code.sf.net/p/ngspice/ngspice into pre-master

This commit is contained in:
Holger Vogt 2020-05-23 12:33:29 +02:00
commit b9e3f94610
2 changed files with 8 additions and 0 deletions

View File

@ -461,6 +461,9 @@ cp_addcomm(char *word, long int bits0, long int bits1, long int bits2, long int
{
struct ccom *cc;
if(cp_nocc)
return;
cc = clookup(word, &commands, FALSE, TRUE);
cc->cc_invalid = 0;
cc->cc_kwords[0] = bits0;
@ -490,6 +493,9 @@ cp_addkword(int kw_class, char *word)
{
struct ccom *cc;
if(cp_nocc)
return;
if ((kw_class < 1) || (kw_class >= NCLASSES)) {
fprintf(cp_err, "cp_addkword: Internal Error: bad class %d\n",
kw_class);

View File

@ -703,6 +703,8 @@ ngSpice_Init(SendChar* printfcn, SendStat* statusfcn, ControlledExit* ngspiceexi
nobgtrwanted = TRUE;
immediate = FALSE;
cp_nocc = TRUE;
#ifdef THREADS
/* init the mutexes */
#ifdef HAVE_LIBPTHREAD