luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vsrc/isrc, use an explicit #ifdef "PULSE_FUN_TYPES" guard 

to avoid duplicate definition
This commit is contained in:
rlar 2018-04-15 07:25:46 +02:00
parent 8109b4874e
commit 73c9a79c6c
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/spicelib/devices/isrc/isrcdefs.h
View File

@ -138,7 +138,8 @@ typedef struct sISRCmodel {
/* source types */
#ifndef PULSE
#ifndef PULSE_FUN_TYPES
#define PULSE_FUN_TYPES
#define PULSE 1
#define SINE 2
#define EXP 3
@ -148,7 +149,7 @@ typedef struct sISRCmodel {
#define TRNOISE 7
#define TRRANDOM 8
#define EXTERNAL 9
#endif /*PULSE*/
#endif
/* device parameters */
#define ISRC_DC 1

5
src/spicelib/devices/vsrc/vsrcdefs.h
View File

@ -164,7 +164,8 @@ typedef struct sVSRCmodel {
} VSRCmodel;
/* source function types (shared with current sources) */
#ifndef PULSE
#ifndef PULSE_FUN_TYPES
#define PULSE_FUN_TYPES
#define PULSE 1
#define SINE 2
#define EXP 3
@ -174,7 +175,7 @@ typedef struct sVSRCmodel {
#define TRNOISE 7
#define TRRANDOM 8
#define EXTERNAL 9
#endif /*PULSE*/
#endif
/* device parameters */
#define VSRC_DC 1