From 3694dddd6413fea7890460bd294401b71377fda8 Mon Sep 17 00:00:00 2001 From: Holger Vogt Date: Tue, 23 Apr 2024 11:33:34 +0200 Subject: [PATCH] Revert "Define the members of the struct in the correct sequence." This reverts commit ce8bce79477198e9df96fbbfd01aaf5700544da2. --- src/include/ngspice/devdefs.h | 5 ++--- src/include/ngspice/ifsim.h | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/include/ngspice/devdefs.h b/src/include/ngspice/devdefs.h index 09af7ce68..870708b69 100644 --- a/src/include/ngspice/devdefs.h +++ b/src/include/ngspice/devdefs.h @@ -107,9 +107,6 @@ typedef struct SPICEdev { /* noise routine */ int (*DEVsoaCheck)(CKTcircuit*,GENmodel*); /* subroutine to call on soa check */ - int *DEVinstSize; /* size of an instance */ - int *DEVmodSize; /* size of a model */ - #ifdef CIDER void (*DEVdump)(GENmodel *, CKTcircuit *); void (*DEVacct)(GENmodel *, CKTcircuit *, FILE *); @@ -117,6 +114,8 @@ typedef struct SPICEdev { * now used only by cider numerical devices */ #endif + int *DEVinstSize; /* size of an instance */ + int *DEVmodSize; /* size of a model */ #ifdef KLU int (*DEVbindCSC)(GENmodel *, CKTcircuit *); diff --git a/src/include/ngspice/ifsim.h b/src/include/ngspice/ifsim.h index 1802a2a60..cf019be2e 100644 --- a/src/include/ngspice/ifsim.h +++ b/src/include/ngspice/ifsim.h @@ -282,8 +282,6 @@ struct IFdevice { int *numModelParms; /* number of model parameter descriptors */ IFparm *modelParms; /* array of model parameter descriptors */ - int flags; /* DEV_ */ - /* gtri - modify - wbk - 10/11/90 - add entries to hold data required */ /* by new parser */ #ifdef XSPICE @@ -300,6 +298,8 @@ struct IFdevice { /* gtri - end - wbk - 10/11/90 */ #endif + int flags; /* DEV_ */ + #ifdef OSDI const void *registry_entry; #endif