From 73890e3cdbbea0ea38bc9b88c3390895fa1ac3fc Mon Sep 17 00:00:00 2001 From: rlar Date: Fri, 30 Jul 2010 15:38:27 +0000 Subject: [PATCH] remove some #ifdef __STDC__ wrappers, and some stray '#' --- ChangeLog | 26 ++++++++++++++++++++- src/include/ifsim.h | 5 +--- src/include/inpptree.h | 4 ---- src/ngproc2mod.c | 4 ---- src/spicelib/devices/bsim3/bsim3def.h | 6 ----- src/spicelib/devices/bsim3/bsim3ext.h | 24 ------------------- src/spicelib/devices/bsim3soi/b4soidef.h | 6 ----- src/spicelib/devices/bsim3soi/b4soiext.h | 24 ------------------- src/spicelib/devices/bsim3v1/bsim3v1def.h | 6 ----- src/spicelib/devices/bsim4/bsim4def.h | 6 ----- src/spicelib/devices/bsim4/bsim4ext.h | 24 ------------------- src/spicelib/devices/bsim4v2/bsim4v2def.h | 7 ------ src/spicelib/devices/bsim4v2/bsim4v2ext.h | 24 ------------------- src/spicelib/devices/bsim4v3/bsim4v3def.h | 7 ------ src/spicelib/devices/bsim4v3/bsim4v3ext.h | 24 ------------------- src/spicelib/devices/bsim4v4/bsim4v4def.h | 1 - src/spicelib/devices/bsim4v5/bsim4v5def.h | 6 ----- src/spicelib/devices/bsim4v5/bsim4v5ext.h | 24 ------------------- src/spicelib/devices/hisim/hsm1eval102.c | 8 +------ src/spicelib/devices/hisim/hsm1eval112.c | 8 +------ src/spicelib/devices/hisim/hsm1eval120.c | 28 +++-------------------- src/spicelib/devices/jfet2/psmodel.h | 7 ------ 22 files changed, 31 insertions(+), 248 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6276ee263..0997228c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,28 @@ -2010-07-30 Robert Larice <> +2010-07-30 Robert Larice + * src/include/ifsim.h , + * src/include/inpptree.h , + * src/ngproc2mod.c , + * src/spicelib/devices/bsim3/bsim3def.h , + * src/spicelib/devices/bsim3/bsim3ext.h , + * src/spicelib/devices/bsim3soi/b4soidef.h , + * src/spicelib/devices/bsim3soi/b4soiext.h , + * src/spicelib/devices/bsim3v1/bsim3v1def.h , + * src/spicelib/devices/bsim4/bsim4def.h , + * src/spicelib/devices/bsim4/bsim4ext.h , + * src/spicelib/devices/bsim4v2/bsim4v2def.h , + * src/spicelib/devices/bsim4v2/bsim4v2ext.h , + * src/spicelib/devices/bsim4v3/bsim4v3def.h , + * src/spicelib/devices/bsim4v3/bsim4v3ext.h , + * src/spicelib/devices/bsim4v4/bsim4v4def.h , + * src/spicelib/devices/bsim4v5/bsim4v5def.h , + * src/spicelib/devices/bsim4v5/bsim4v5ext.h , + * src/spicelib/devices/hisim/hsm1eval102.c , + * src/spicelib/devices/hisim/hsm1eval112.c , + * src/spicelib/devices/hisim/hsm1eval120.c , + * src/spicelib/devices/jfet2/psmodel.h : + remove some #ifdef __STDC__ wrappers, and some stray '#' + +2010-07-30 Robert Larice * src/frontend/plotting/agraf.c , * src/spicelib/devices/bsim2/b2set.c , * src/spicelib/devices/bsim4v2/b4v2set.c , diff --git a/src/include/ifsim.h b/src/include/ifsim.h index c46119a7e..7301bd742 100644 --- a/src/include/ifsim.h +++ b/src/include/ifsim.h @@ -169,11 +169,8 @@ struct IFparseTree { int numVars; /* number of variables used */ int *varTypes; /* array of types of variables */ IFvalue *vars; /* array of structures describing values */ -#ifdef __STDC__ int (*IFeval) (IFparseTree *, double, double *, double *, double *); -#else - int (*IFeval) (); /* function to call to get evaluated */ -#endif /* STDC */ + /* function to call to get evaluated */ }; diff --git a/src/include/inpptree.h b/src/include/inpptree.h index bd2f6220a..95eabff61 100644 --- a/src/include/inpptree.h +++ b/src/include/inpptree.h @@ -202,11 +202,7 @@ extern double PTle0(double arg); /* And in IFeval.c */ -#ifdef __STDC__ extern int IFeval(IFparseTree *tree, double gmin, double *result, double *vals, double *derivs); -#else /* stdc */ -extern int IFeval(); -#endif /* stdc */ #endif diff --git a/src/ngproc2mod.c b/src/ngproc2mod.c index ce08dd4f2..4a7d1b727 100644 --- a/src/ngproc2mod.c +++ b/src/ngproc2mod.c @@ -11,11 +11,7 @@ Copyright 1990 Regents of the University of California. All rights reserved. #include "suffix.h" -#ifdef __STDC__ void getdata(double*,int,int); -#else /* stdc */ -void getdata(); -#endif /* stdc */ typedef struct snmod { struct snmod *nnext; diff --git a/src/spicelib/devices/bsim3/bsim3def.h b/src/spicelib/devices/bsim3/bsim3def.h index beb4164e6..c588bb22b 100644 --- a/src/spicelib/devices/bsim3/bsim3def.h +++ b/src/spicelib/devices/bsim3/bsim3def.h @@ -1818,18 +1818,12 @@ typedef struct sBSIM3model #include "bsim3ext.h" -#ifdef __STDC__ extern void BSIM3evaluate(double,double,double,BSIM3instance*,BSIM3model*, double*,double*,double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, CKTcircuit*); extern int BSIM3debug(BSIM3model*, BSIM3instance*, CKTcircuit*, int); extern int BSIM3checkModel(BSIM3model*, BSIM3instance*, CKTcircuit*); -#else /* stdc */ -extern void BSIM3evaluate(); -extern int BSIM3debug(); -extern int BSIM3checkModel(); -#endif /* stdc */ #endif /*BSIM3*/ diff --git a/src/spicelib/devices/bsim3/bsim3ext.h b/src/spicelib/devices/bsim3/bsim3ext.h index 7dfb5bdf3..71662ea8b 100644 --- a/src/spicelib/devices/bsim3/bsim3ext.h +++ b/src/spicelib/devices/bsim3/bsim3ext.h @@ -5,7 +5,6 @@ Modified by Yuhua Cheng to use BSIM3v3 in Spice3f5 (Jan. 1997) File: bsim3ext.h **********/ -#ifdef __STDC__ extern int BSIM3acLoad(GENmodel *,CKTcircuit*); extern int BSIM3ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*); extern int BSIM3convTest(GENmodel *,CKTcircuit*); @@ -29,26 +28,3 @@ extern int BSIM3temp(GENmodel*,CKTcircuit*); extern int BSIM3trunc(GENmodel*,CKTcircuit*,double*); extern int BSIM3noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*); extern int BSIM3unsetup(GENmodel*,CKTcircuit*); - -#else /* stdc */ -extern int BSIM3acLoad(); -extern int BSIM3delete(); -extern void BSIM3destroy(); -extern int BSIM3getic(); -extern int BSIM3load(); -extern int BSIM3mDelete(); -extern int BSIM3ask(); -extern int BSIM3mAsk(); -extern int BSIM3convTest(); -extern int BSIM3temp(); -extern int BSIM3mParam(); -extern void BSIM3mosCap(); -extern int BSIM3param(); -extern int BSIM3pzLoad(); -extern int BSIM3setup(); -extern int BSIM3trunc(); -extern int BSIM3noise(); -extern int BSIM3unsetup(); - -#endif /* stdc */ - diff --git a/src/spicelib/devices/bsim3soi/b4soidef.h b/src/spicelib/devices/bsim3soi/b4soidef.h index 1d747162e..55bec3b78 100644 --- a/src/spicelib/devices/bsim3soi/b4soidef.h +++ b/src/spicelib/devices/bsim3soi/b4soidef.h @@ -4249,18 +4249,12 @@ typedef struct sB4SOImodel #include "b4soiext.h" -#ifdef __STDC__ extern void B4SOIevaluate(double,double,double,B4SOIinstance*,B4SOImodel*, double*,double*,double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, CKTcircuit*); extern int B4SOIdebug(B4SOImodel*, B4SOIinstance*, CKTcircuit*, int); extern int B4SOIcheckModel(B4SOImodel*, B4SOIinstance*, CKTcircuit*); -#else /* stdc */ -extern void B4SOIevaluate(); -extern int B4SOIdebug(); -extern int B4SOIcheckModel(); -#endif /* stdc */ #endif /*B4SOI*/ diff --git a/src/spicelib/devices/bsim3soi/b4soiext.h b/src/spicelib/devices/bsim3soi/b4soiext.h index 5186f1b02..81a582788 100644 --- a/src/spicelib/devices/bsim3soi/b4soiext.h +++ b/src/spicelib/devices/bsim3soi/b4soiext.h @@ -6,7 +6,6 @@ Authors: 2009- Tanvir Morshed, Ali Niknejad, Chenming Hu. File: b4soiext.h **********/ -#ifdef __STDC__ extern int B4SOIacLoad(GENmodel *,CKTcircuit*); extern int B4SOIask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*); extern int B4SOIconvTest(GENmodel *,CKTcircuit*); @@ -30,26 +29,3 @@ extern int B4SOItemp(GENmodel*,CKTcircuit*); extern int B4SOItrunc(GENmodel*,CKTcircuit*,double*); extern int B4SOInoise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*); extern int B4SOIunsetup(GENmodel*,CKTcircuit*); - -#else /* stdc */ -extern int B4SOIacLoad(); -extern int B4SOIdelete(); -extern void B4SOIdestroy(); -extern int B4SOIgetic(); -extern int B4SOIload(); -extern int B4SOImDelete(); -extern int B4SOIask(); -extern int B4SOImAsk(); -extern int B4SOIconvTest(); -extern int B4SOItemp(); -extern int B4SOImParam(); -extern void B4SOImosCap(); -extern int B4SOIparam(); -extern int B4SOIpzLoad(); -extern int B4SOIsetup(); -extern int B4SOItrunc(); -extern int B4SOInoise(); -extern int B4SOIunsetup(); - -#endif /* stdc */ - diff --git a/src/spicelib/devices/bsim3v1/bsim3v1def.h b/src/spicelib/devices/bsim3v1/bsim3v1def.h index 5a9776f95..f8469149a 100644 --- a/src/spicelib/devices/bsim3v1/bsim3v1def.h +++ b/src/spicelib/devices/bsim3v1/bsim3v1def.h @@ -1610,18 +1610,12 @@ typedef struct sBSIM3v1model #include "bsim3v1ext.h" -#ifdef __STDC__ extern void BSIM3v1evaluate(double,double,double,BSIM3v1instance*,BSIM3v1model*, double*,double*,double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, CKTcircuit*); extern int BSIM3v1debug(BSIM3v1model*, BSIM3v1instance*, CKTcircuit*, int); extern int BSIM3v1checkModel(BSIM3v1model*, BSIM3v1instance*, CKTcircuit*); -#else /* stdc */ -extern void BSIM3v1evaluate(); -extern int BSIM3v1debug(); -extern int BSIM3v1checkModel(); -#endif /* stdc */ #endif /*BSIM3v1*/ diff --git a/src/spicelib/devices/bsim4/bsim4def.h b/src/spicelib/devices/bsim4/bsim4def.h index ae8b46107..c2b58c335 100644 --- a/src/spicelib/devices/bsim4/bsim4def.h +++ b/src/spicelib/devices/bsim4/bsim4def.h @@ -3555,17 +3555,11 @@ typedef struct sBSIM4model #include "bsim4ext.h" -#ifdef __STDC__ extern void BSIM4evaluate(double,double,double,BSIM4instance*,BSIM4model*, double*,double*,double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, CKTcircuit*); extern int BSIM4debug(BSIM4model*, BSIM4instance*, CKTcircuit*, int); extern int BSIM4checkModel(BSIM4model*, BSIM4instance*, CKTcircuit*); -#else /* stdc */ -extern void BSIM4evaluate(); -extern int BSIM4debug(); -extern int BSIM4checkModel(); -#endif /* stdc */ #endif /*BSIM4*/ diff --git a/src/spicelib/devices/bsim4/bsim4ext.h b/src/spicelib/devices/bsim4/bsim4ext.h index 3785df29c..171406ae5 100644 --- a/src/spicelib/devices/bsim4/bsim4ext.h +++ b/src/spicelib/devices/bsim4/bsim4ext.h @@ -5,7 +5,6 @@ Author: 2001- Xuemei Xi File: bsim4ext.h **********/ -#ifdef __STDC__ extern int BSIM4acLoad(GENmodel *,CKTcircuit*); extern int BSIM4ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*); extern int BSIM4convTest(GENmodel *,CKTcircuit*); @@ -29,26 +28,3 @@ extern int BSIM4temp(GENmodel*,CKTcircuit*); extern int BSIM4trunc(GENmodel*,CKTcircuit*,double*); extern int BSIM4noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*); extern int BSIM4unsetup(GENmodel*,CKTcircuit*); - -#else /* stdc */ -extern int BSIM4acLoad(); -extern int BSIM4delete(); -extern void BSIM4destroy(); -extern int BSIM4getic(); -extern int BSIM4load(); -extern int BSIM4mDelete(); -extern int BSIM4ask(); -extern int BSIM4mAsk(); -extern int BSIM4convTest(); -extern int BSIM4temp(); -extern int BSIM4mParam(); -extern void BSIM4mosCap(); -extern int BSIM4param(); -extern int BSIM4pzLoad(); -extern int BSIM4setup(); -extern int BSIM4trunc(); -extern int BSIM4noise(); -extern int BSIM4unsetup(); - -#endif /* stdc */ - diff --git a/src/spicelib/devices/bsim4v2/bsim4v2def.h b/src/spicelib/devices/bsim4v2/bsim4v2def.h index 70d24e86f..aa29e9edc 100644 --- a/src/spicelib/devices/bsim4v2/bsim4v2def.h +++ b/src/spicelib/devices/bsim4v2/bsim4v2def.h @@ -2647,20 +2647,13 @@ typedef struct sBSIM4v2model #define BSIM4v2_IGCD 1010 -# #include "bsim4v2ext.h" -#ifdef __STDC__ extern void BSIM4v2evaluate(double,double,double,BSIM4v2instance*,BSIM4v2model*, double*,double*,double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, CKTcircuit*); extern int BSIM4v2debug(BSIM4v2model*, BSIM4v2instance*, CKTcircuit*, int); extern int BSIM4v2checkModel(BSIM4v2model*, BSIM4v2instance*, CKTcircuit*); -#else /* stdc */ -extern void BSIM4v2evaluate(); -extern int BSIM4v2debug(); -extern int BSIM4v2checkModel(); -#endif /* stdc */ #endif /*BSIM4v2*/ diff --git a/src/spicelib/devices/bsim4v2/bsim4v2ext.h b/src/spicelib/devices/bsim4v2/bsim4v2ext.h index 4c46060bd..8a8cccbb2 100644 --- a/src/spicelib/devices/bsim4v2/bsim4v2ext.h +++ b/src/spicelib/devices/bsim4v2/bsim4v2ext.h @@ -5,7 +5,6 @@ Author: 2001 Xuemei Xi File: bsim4ext.h **********/ -#ifdef __STDC__ extern int BSIM4v2acLoad(GENmodel *,CKTcircuit*); extern int BSIM4v2ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*); extern int BSIM4v2convTest(GENmodel *,CKTcircuit*); @@ -29,26 +28,3 @@ extern int BSIM4v2temp(GENmodel*,CKTcircuit*); extern int BSIM4v2trunc(GENmodel*,CKTcircuit*,double*); extern int BSIM4v2noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*); extern int BSIM4v2unsetup(GENmodel*,CKTcircuit*); - -#else /* stdc */ -extern int BSIM4v2acLoad(); -extern int BSIM4v2delete(); -extern void BSIM4v2destroy(); -extern int BSIM4v2getic(); -extern int BSIM4v2load(); -extern int BSIM4v2mDelete(); -extern int BSIM4v2ask(); -extern int BSIM4v2mAsk(); -extern int BSIM4v2convTest(); -extern int BSIM4v2temp(); -extern int BSIM4v2mParam(); -extern void BSIM4v2mosCap(); -extern int BSIM4v2param(); -extern int BSIM4v2pzLoad(); -extern int BSIM4v2setup(); -extern int BSIM4v2trunc(); -extern int BSIM4v2noise(); -extern int BSIM4v2unsetup(); - -#endif /* stdc */ - diff --git a/src/spicelib/devices/bsim4v3/bsim4v3def.h b/src/spicelib/devices/bsim4v3/bsim4v3def.h index 5340637df..02a5e2023 100644 --- a/src/spicelib/devices/bsim4v3/bsim4v3def.h +++ b/src/spicelib/devices/bsim4v3/bsim4v3def.h @@ -2800,20 +2800,13 @@ typedef struct sBSIM4v3model #define BSIM4v3_IGCD 1010 -# #include "bsim4v3ext.h" -#ifdef __STDC__ extern void BSIM4v3evaluate(double,double,double,BSIM4v3instance*,BSIM4v3model*, double*,double*,double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, CKTcircuit*); extern int BSIM4v3debug(BSIM4v3model*, BSIM4v3instance*, CKTcircuit*, int); extern int BSIM4v3checkModel(BSIM4v3model*, BSIM4v3instance*, CKTcircuit*); -#else /* stdc */ -extern void BSIM4v3evaluate(); -extern int BSIM4v3debug(); -extern int BSIM4v3checkModel(); -#endif /* stdc */ #endif /*BSIM4v3*/ diff --git a/src/spicelib/devices/bsim4v3/bsim4v3ext.h b/src/spicelib/devices/bsim4v3/bsim4v3ext.h index af7104b1e..9f0424df9 100644 --- a/src/spicelib/devices/bsim4v3/bsim4v3ext.h +++ b/src/spicelib/devices/bsim4v3/bsim4v3ext.h @@ -5,7 +5,6 @@ Author: 2001- Xuemei Xi File: bsim4v3ext.h **********/ -#ifdef __STDC__ extern int BSIM4v3acLoad(GENmodel *,CKTcircuit*); extern int BSIM4v3ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*); extern int BSIM4v3convTest(GENmodel *,CKTcircuit*); @@ -29,26 +28,3 @@ extern int BSIM4v3temp(GENmodel*,CKTcircuit*); extern int BSIM4v3trunc(GENmodel*,CKTcircuit*,double*); extern int BSIM4v3noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*); extern int BSIM4v3unsetup(GENmodel*,CKTcircuit*); - -#else /* stdc */ -extern int BSIM4v3acLoad(); -extern int BSIM4v3delete(); -extern void BSIM4v3destroy(); -extern int BSIM4v3getic(); -extern int BSIM4v3load(); -extern int BSIM4v3mDelete(); -extern int BSIM4v3ask(); -extern int BSIM4v3mAsk(); -extern int BSIM4v3convTest(); -extern int BSIM4v3temp(); -extern int BSIM4v3mParam(); -extern void BSIM4v3mosCap(); -extern int BSIM4v3param(); -extern int BSIM4v3pzLoad(); -extern int BSIM4v3setup(); -extern int BSIM4v3trunc(); -extern int BSIM4v3noise(); -extern int BSIM4v3unsetup(); - -#endif /* stdc */ - diff --git a/src/spicelib/devices/bsim4v4/bsim4v4def.h b/src/spicelib/devices/bsim4v4/bsim4v4def.h index 22428a099..65d4cae29 100644 --- a/src/spicelib/devices/bsim4v4/bsim4v4def.h +++ b/src/spicelib/devices/bsim4v4/bsim4v4def.h @@ -2903,7 +2903,6 @@ typedef struct sBSIM4v4model #define BSIM4v4_IGCS 1009 #define BSIM4v4_IGCD 1010 -# #include "bsim4v4ext.h" diff --git a/src/spicelib/devices/bsim4v5/bsim4v5def.h b/src/spicelib/devices/bsim4v5/bsim4v5def.h index 46fe77421..3d8fa4223 100644 --- a/src/spicelib/devices/bsim4v5/bsim4v5def.h +++ b/src/spicelib/devices/bsim4v5/bsim4v5def.h @@ -3164,17 +3164,11 @@ typedef struct sBSIM4v5model #include "bsim4v5ext.h" -#ifdef __STDC__ extern void BSIM4v5evaluate(double,double,double,BSIM4v5instance*,BSIM4v5model*, double*,double*,double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, double*, CKTcircuit*); extern int BSIM4v5debug(BSIM4v5model*, BSIM4v5instance*, CKTcircuit*, int); extern int BSIM4v5checkModel(BSIM4v5model*, BSIM4v5instance*, CKTcircuit*); -#else /* stdc */ -extern void BSIM4v5evaluate(); -extern int BSIM4v5debug(); -extern int BSIM4v5checkModel(); -#endif /* stdc */ #endif /*BSIM4v5*/ diff --git a/src/spicelib/devices/bsim4v5/bsim4v5ext.h b/src/spicelib/devices/bsim4v5/bsim4v5ext.h index e12795859..511969bfb 100644 --- a/src/spicelib/devices/bsim4v5/bsim4v5ext.h +++ b/src/spicelib/devices/bsim4v5/bsim4v5ext.h @@ -5,7 +5,6 @@ Author: 2001- Xuemei Xi File: bsim4v5ext.h **********/ -#ifdef __STDC__ extern int BSIM4v5acLoad(GENmodel *,CKTcircuit*); extern int BSIM4v5ask(CKTcircuit *,GENinstance*,int,IFvalue*,IFvalue*); extern int BSIM4v5convTest(GENmodel *,CKTcircuit*); @@ -29,26 +28,3 @@ extern int BSIM4v5temp(GENmodel*,CKTcircuit*); extern int BSIM4v5trunc(GENmodel*,CKTcircuit*,double*); extern int BSIM4v5noise(int,int,GENmodel*,CKTcircuit*,Ndata*,double*); extern int BSIM4v5unsetup(GENmodel*,CKTcircuit*); - -#else /* stdc */ -extern int BSIM4v5acLoad(); -extern int BSIM4v5delete(); -extern void BSIM4v5destroy(); -extern int BSIM4v5getic(); -extern int BSIM4v5load(); -extern int BSIM4v5mDelete(); -extern int BSIM4v5ask(); -extern int BSIM4v5mAsk(); -extern int BSIM4v5convTest(); -extern int BSIM4v5temp(); -extern int BSIM4v5mParam(); -extern void BSIM4v5mosCap(); -extern int BSIM4v5param(); -extern int BSIM4v5pzLoad(); -extern int BSIM4v5setup(); -extern int BSIM4v5trunc(); -extern int BSIM4v5noise(); -extern int BSIM4v5unsetup(); - -#endif /* stdc */ - diff --git a/src/spicelib/devices/hisim/hsm1eval102.c b/src/spicelib/devices/hisim/hsm1eval102.c index 6cf200580..1737f0d0a 100644 --- a/src/spicelib/devices/hisim/hsm1eval102.c +++ b/src/spicelib/devices/hisim/hsm1eval102.c @@ -75,19 +75,13 @@ /*===========================================================* * Function hsm1eval. (HiSIM1.0.1) *=================*/ -#ifdef __STDC__ + int HSM1evaluate102 ( HiSIM_input sIN, HiSIM_output *pOT, HiSIM_messenger *pMS ) -#else -int HSM1evaluate102( sIN , pOT , pMS ) - HiSIM_input sIN ; - HiSIM_output *pOT ; - HiSIM_messenger *pMS ; -#endif { /*---------------------------------------------------* diff --git a/src/spicelib/devices/hisim/hsm1eval112.c b/src/spicelib/devices/hisim/hsm1eval112.c index 14ac7923f..c295286bc 100644 --- a/src/spicelib/devices/hisim/hsm1eval112.c +++ b/src/spicelib/devices/hisim/hsm1eval112.c @@ -75,19 +75,13 @@ /*===========================================================* * Function hsm1eval. *=================*/ -#ifdef __STDC__ + int HSM1evaluate112 ( HiSIM_input sIN, HiSIM_output *pOT, HiSIM_messenger *pMS ) -#else -int HSM1evaluate112( sIN , pOT , pMS ) - HiSIM_input sIN ; - HiSIM_output *pOT ; - HiSIM_messenger *pMS ; -#endif { /*---------------------------------------------------* diff --git a/src/spicelib/devices/hisim/hsm1eval120.c b/src/spicelib/devices/hisim/hsm1eval120.c index 1f6743c94..dce683bd5 100644 --- a/src/spicelib/devices/hisim/hsm1eval120.c +++ b/src/spicelib/devices/hisim/hsm1eval120.c @@ -72,7 +72,7 @@ #include "hisim.h" #include "hsm1evalenv.h" -#ifdef __STDC__ + /*-----------------------------------* * Constants for Smoothing functions *---------------*/ @@ -86,42 +86,20 @@ static const double pol_vds_dlt = 2.0e-2 ; static const double qme_vgs_dlt = 9.5e-3 ; static const double lp_vds_dlt = 2.0e-2 ; static const double sc_vds_dlt = 2.0e-2 ; -#endif + /*===========================================================* * Function hsm1eval. *=================*/ -#ifdef __STDC__ + int HSM1evaluate120 ( HiSIM_input sIN, HiSIM_output *pOT, HiSIM_messenger *pMS ) -#else -int HSM1evaluate120( sIN , pOT , pMS ) - HiSIM_input sIN ; - HiSIM_output *pOT ; - HiSIM_messenger *pMS ; -#endif { -#ifndef __STDC__ -/*-----------------------------------* - * Constants for Smoothing functions - *---------------*/ -static double Vgsz_pol_sat = 2.0 ; -static double Vdsz_pol_sat = 3.5 ; -static double Vgsz_qme_sat = 2.0 ; -static double Vdsz_lp_sat = 3.5 ; -static double Vdsz_sc_sat = 3.5 ; -static double pol_vgs_dlt = 2.0e-2 ; -static double pol_vds_dlt = 2.0e-2 ; -static double qme_vgs_dlt = 9.5e-3 ; -static double lp_vds_dlt = 2.0e-2 ; -static double sc_vds_dlt = 2.0e-2 ; -#endif - /*---------------------------------------------------* * Local variables. *-----------------*/ diff --git a/src/spicelib/devices/jfet2/psmodel.h b/src/spicelib/devices/jfet2/psmodel.h index e943bef78..8560e1c25 100644 --- a/src/spicelib/devices/jfet2/psmodel.h +++ b/src/spicelib/devices/jfet2/psmodel.h @@ -22,19 +22,12 @@ typedef CKTcircuit cref; /* circuit specific variables */ typedef JFET2model modl; /* model parameters for this type of device */ typedef JFET2instance inst; /* parameters specific to this device instance */ -#ifdef __STDC__ extern void PSinstanceinit(modl *,inst *); extern double PSids(cref *,modl *,inst *,double,double, double *,double *,double *,double *,double *,double *); extern void PScharge(cref *,modl *,inst *,double,double,double *,double *); extern void PSacload(cref *,modl *,inst *,double,double,double,double, double *,double *,double *,double *); -#else -extern void PSinstanceinit(); -extern double PSids(); -extern void PScharge(); -extern void PSacload(); -#endif #ifdef PSMODEL_C /* PSMODEL_C defined when included from "psmodel.c" */ /* The following glue definitions need to be changed to suit the specific