From 73a80756d4eaeb339ad96208037cd32af78f818c Mon Sep 17 00:00:00 2001 From: rlar Date: Sun, 15 Aug 2010 17:54:33 +0000 Subject: [PATCH] typedefs for JOB and TSKtask into "typedefs.h" --- ChangeLog | 6 ++++++ src/include/jobdefs.h | 8 ++++---- src/include/tskdefs.h | 6 +++--- src/include/typedefs.h | 2 ++ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 87877f80a..025527837 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-08-15 Robert Larice + * src/include/jobdefs.h , + * src/include/tskdefs.h , + * src/include/typedefs.h : + typedefs for JOB and TSKtask into "typedefs.h" + 2010-08-15 Robert Larice * src/spicelib/parser/inp2dot.c : use the type CKTnode instead of void* diff --git a/src/include/jobdefs.h b/src/include/jobdefs.h index fd47d7959..147b145c4 100644 --- a/src/include/jobdefs.h +++ b/src/include/jobdefs.h @@ -7,14 +7,14 @@ Author: 1985 Thomas L. Quarles #define JOBdef +#include "typedefs.h" #include "ifsim.h" -typedef struct sJOB{ +struct JOB { int JOBtype; /* type of job */ - struct sJOB *JOBnextJob; /* next job in list */ + struct JOB *JOBnextJob; /* next job in list */ IFuid JOBname; /* name of this job */ - -} JOB; +}; #define NODOMAIN 0 #define TIMEDOMAIN 1 diff --git a/src/include/tskdefs.h b/src/include/tskdefs.h index c74dcb103..611f52155 100644 --- a/src/include/tskdefs.h +++ b/src/include/tskdefs.h @@ -9,9 +9,10 @@ Modified: 2000 AlansFixes #define TSK +#include "typedefs.h" #include "jobdefs.h" -typedef struct { +struct TSKtask { JOB taskOptions; /* job structure at the front to hold options */ JOB *jobs; char *TSKname; @@ -64,7 +65,6 @@ typedef struct { unsigned int TSKnodeDamping:1; /* flag for node damping */ double TSKabsDv; /* abs limit for iter-iter voltage change */ double TSKrelDv; /* rel limit for iter-iter voltage change */ - -}TSKtask; +}; #endif /*TSK*/ diff --git a/src/include/typedefs.h b/src/include/typedefs.h index 3d89ac034..5be134193 100644 --- a/src/include/typedefs.h +++ b/src/include/typedefs.h @@ -41,5 +41,7 @@ typedef struct PZAN PZAN; typedef struct SENstruct SENstruct; +typedef struct TSKtask TSKtask; +typedef struct JOB JOB; #endif