Browse Source

fix a compiler warning, void* versus void(*)(void)

pre-master-46
rlar 16 years ago
parent
commit
d51c1e1b7d
  1. 1419
      ChangeLog
  2. 2
      src/include/inpptree.h
  3. 4
      src/spicelib/parser/inpptree.c

1419
ChangeLog
File diff suppressed because it is too large
View File

2
src/include/inpptree.h

@ -50,7 +50,7 @@ typedef struct INPparseNode {
int valueIndex; /* If INP_VAR, index into vars array. */ int valueIndex; /* If INP_VAR, index into vars array. */
char *funcname; /* If INP_FUNCTION, name of function, */ char *funcname; /* If INP_FUNCTION, name of function, */
int funcnum; /* ... one of PTF_*, */ int funcnum; /* ... one of PTF_*, */
void *function; /* ... and pointer to the function. */
void (*function)(void); /* ... and pointer to the function. */
void *data; /* private data for certain functions, currently PTF_PWL */ void *data; /* private data for certain functions, currently PTF_PWL */
} INPparseNode; } INPparseNode;

4
src/spicelib/parser/inpptree.c

@ -42,7 +42,7 @@ extern IFsimulator *ft_sim; /* XXX */
static struct op { static struct op {
int number; int number;
char *name; char *name;
void *funcptr;
void (*funcptr)(void);
} ops[] = { } ops[] = {
{ {
PT_COMMA, ",", NULL}, { PT_COMMA, ",", NULL}, {
@ -58,7 +58,7 @@ static struct op {
static struct func { static struct func {
char *name; char *name;
int number; int number;
void *funcptr;
void (*funcptr)(void);
} funcs[] = { } funcs[] = {
{ "abs", PTF_ABS, (void(*)(void)) PTabs } , { "abs", PTF_ABS, (void(*)(void)) PTabs } ,
{ "acos", PTF_ACOS, (void(*)(void)) PTacos } , { "acos", PTF_ACOS, (void(*)(void)) PTacos } ,

Loading…
Cancel
Save