Browse Source

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

to avoid duplicate definition
pre-master-46
rlar 8 years ago
parent
commit
3b0e8cb8f1
  1. 5
      src/spicelib/devices/isrc/isrcdefs.h
  2. 5
      src/spicelib/devices/vsrc/vsrcdefs.h

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

@ -87,7 +87,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
@ -97,7 +98,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

@ -94,7 +94,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
@ -104,7 +105,7 @@ typedef struct sVSRCmodel {
#define TRNOISE 7
#define TRRANDOM 8
#define EXTERNAL 9
#endif /*PULSE*/
#endif
/* device parameters */
#define VSRC_DC 1

Loading…
Cancel
Save