From 1dcc3ea6ff6ecf238ef3833fc0f3ff7a2ead8583 Mon Sep 17 00:00:00 2001
From: arno <arno>
Date: Thu, 25 May 2000 19:46:56 +0000
Subject: [PATCH] 	* inpdefs.h sperror.h: Removed/updated SPerror()
 function 	declaration.

	* cktdefs.h spmatrix.h: Removed non ANSI function declarations.
---
 src/include/cktdefs.h  |  1 -
 src/include/inpdefs.h  | 62 ------------------------------------------
 src/include/sperror.h  | 13 +++++----
 src/include/spmatrix.h | 49 ---------------------------------
 4 files changed, 7 insertions(+), 118 deletions(-)

diff --git a/src/include/cktdefs.h b/src/include/cktdefs.h
index b4d20bce8..d36fa710b 100644
--- a/src/include/cktdefs.h
+++ b/src/include/cktdefs.h
@@ -314,7 +314,6 @@ extern void SENdestroy( SENstruct *);
 extern int SENsetParm( CKTcircuit *, void *, int , IFvalue *);
 extern int SENstartup( CKTcircuit *);
 extern int SPIinit( IFfrontEnd *, IFsimulator **);
-extern char * SPerror( int );
 extern int TFanal( CKTcircuit *, int );
 extern int TFaskQuest( CKTcircuit *, void *, int , IFvalue *);
 extern int TFsetParm( CKTcircuit *, void *, int , IFvalue *);
diff --git a/src/include/inpdefs.h b/src/include/inpdefs.h
index 8f7cfa7e1..c898be798 100644
--- a/src/include/inpdefs.h
+++ b/src/include/inpdefs.h
@@ -77,7 +77,6 @@ typedef struct sINPmodel{
 #define LOGICAL 1
 #define PHYSICAL 2
 
-#ifdef __STDC__
 int IFnewUid(void*,IFuid*,IFuid,char*,int,void**);
 int IFdelUid(void*,IFuid,int);
 int INPaName(char*,IFvalue*,void*,int*,char*,void**,IFsimulator*,int*,
@@ -133,65 +132,4 @@ int INP2dot(void*,INPtables*,card*,void*,void*);
 INPtables *INPtabInit(int);
 void INPkillMods(void);
 void INPtabEnd(INPtables *);
-#else /* stdc */
-int IFnewUid();
-int IFdelUid();
-int INPaName();
-IFvalue * INPgetValue();
-INPtables *INPtabInit();
-char * INPdevParse();
-char * INPdomodel();
-char * INPerrCat();
-char * INPfindLev();
-char * INPgetMod();
-char *INPerror();
-char *INPmkTemp();
-double INPevaluate();
-int INPapName();
-int INPgetTitle();
-int INPgetTok();
-int INPgndInsert();
-int INPlookMod();
-int INPmakeMod();
-int INPpName();
-int INPreadAll();
-int INPtermInsert();
-int INPmkTerm();
-int INPtypelook();
-void INPcaseFix();
-void INPdoOpts();
-int INPinsert();
-int INPretrieve();
-int INPremove();
-void INPkillMods();
-void INPlist();
-void INPpas1() ;
-void INPpas2() ;
-void INPtabEnd();
-void INPptPrint();
-void INPgetTree();
-void INP2B();
-void INP2C();
-void INP2D();
-void INP2E();
-void INP2F();
-void INP2G();
-void INP2H();
-void INP2I();
-void INP2J();
-void INP2K();
-void INP2L();
-void INP2M();
-void INP2O();
-void INP2Q();
-void INP2R();
-void INP2S();
-void INP2T();
-void INP2U();
-void INP2V();
-void INP2W();
-void INP2Z();
-int INP2dot();
-#endif /* stdc */
-
 #endif /*INP*/
diff --git a/src/include/sperror.h b/src/include/sperror.h
index 2c9fe3486..d3ef2f3b6 100644
--- a/src/include/sperror.h
+++ b/src/include/sperror.h
@@ -3,15 +3,15 @@ Copyright 1990 Regents of the University of California.  All rights reserved.
 Author: 1985 Thomas L. Quarles
 **********/
 
-#ifndef ERRORS
-#define ERRORS
+#ifndef _SPERROR_H
+#define _SPERROR_H
 
 #include "ngspice.h"
 #include "iferrmsg.h"
 
-        /*
-         * definitions for error codes returned by SPICE3 routines.
-         */
+/*
+ * definitions for error codes returned by SPICE3 routines.
+ */
 
 #define E_INTERN E_PANIC
 #define E_BADMATRIX (E_PRIVATE+1)/* ill-formed matrix can't be decomposed */
@@ -35,5 +35,6 @@ Author: 1985 Thomas L. Quarles
 #define E_MULTIERR (E_PRIVATE+18) /* multiple errors from diff. processes */
 #endif /* PARALLEL_ARCH */
 
-char *SPerror();
+const char *SPerror(int type);
+
 #endif
diff --git a/src/include/spmatrix.h b/src/include/spmatrix.h
index 83afafc15..1ea24fb50 100644
--- a/src/include/spmatrix.h
+++ b/src/include/spmatrix.h
@@ -296,10 +296,6 @@ struct  spTemplate
 
 /* Begin function declarations. */
 
-#ifdef __STDC__
-
-/* For compilers that understand function prototypes. */
-
 extern  void     spClear( char* );
 extern  spREAL   spCondition( char*, spREAL, int* );
 extern  char    *spCreate( int, int, int* );
@@ -355,51 +351,6 @@ extern  void     spSolve( char*, spREAL*, spREAL* );
 extern  void     spSolveTransposed( char*, spREAL*, spREAL* );
 #endif /* NOT (spCOMPLEX && spSEPARATED_COMPLEX_VECTORS) */
 
-#else /* NOT defined(__STDC__) */
-
-/* For compilers that do not understand function prototypes. */
-
-extern  void     spClear();
-extern  spREAL   spCondition();
-extern  char    *spCreate();
-extern  void     spDeleteRowAndCol();
-extern  void     spDestroy();
-extern  void     spDeterminant ();
-extern  int      spElementCount();
-extern  int      spError();
-extern  int      spFactor();
-extern  int      spFileMatrix();
-extern  int      spFileStats();
-extern  int      spFileVector();
-extern  int      spFillinCount();
-extern  int      spGetAdmittance();
-extern  spREAL  *spGetElement();
-extern  char    *spGetInitInfo();
-extern  int      spGetOnes();
-extern  int      spGetQuad();
-extern  int      spGetSize();
-extern  int      spInitialize();
-extern  void     spInstallInitInfo();
-extern  spREAL   spLargestElement();
-extern  void     spMNA_Preorder();
-extern  void     spMultiply();
-extern  void     spMultTransposed();
-extern  spREAL   spNorm();
-extern  int      spOrderAndFactor();
-extern  int      spOriginalCount();
-extern  void     spPartition();
-extern  void     spPrint();
-extern  spREAL   spPseudoCondition();
-extern  spREAL   spRoundoff();
-extern  void     spScale();
-extern  void     spSetComplex();
-extern  void     spSetReal();
-extern  void     spSolve();
-extern  void     spSolveTransposed();
-extern  void     spStripFills();
-extern  void     spWhereSingular();
-#endif /* defined(__STDC__) */
-
 #if spCOMPATIBILITY
 extern  char    *AllocateMatrix();
 extern  spREAL  *AddElementToMatrix();