diff --git a/ChangeLog b/ChangeLog index 5b0822b01..6fe270c1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-07-10 Robert Larice + * src/include/lsort.h : + ansi function declaration and definition for SORT() and SORT1() + * src/xspice/cmpp/read_ifs.c : + bool used, Boolean_t wanted. + 2010-07-10 Robert Larice * src/include/miftypes.h , * src/xspice/mif/mifload.c , diff --git a/src/include/lsort.h b/src/include/lsort.h index bc7bbbfbb..0f39cd1cf 100644 --- a/src/include/lsort.h +++ b/src/include/lsort.h @@ -50,14 +50,12 @@ #define DECL_SORT static #endif -DECL_SORT TYPE *SORT(); +DECL_SORT TYPE *SORT(TYPE *list_in, int (*compare)(TYPE*, TYPE*), long cnt ); #ifdef SORT1 -DECL_SORT1 TYPE *SORT1(list_in, compare) -TYPE *list_in; -int (*compare)(); +DECL_SORT1 TYPE *SORT1(TYPE *list_in, int (*compare)(TYPE*, TYPE*) ) { register long cnt; register TYPE *p; @@ -71,10 +69,7 @@ int (*compare)(); #endif -DECL_SORT TYPE *SORT(list_in, compare, cnt) -TYPE *list_in; -int (*compare)(); -long cnt; +DECL_SORT TYPE *SORT(TYPE *list_in, int (*compare)(TYPE*, TYPE*), long cnt ) { register TYPE *p, **plast, *list1, *list2; register long i; diff --git a/src/xspice/cmpp/read_ifs.c b/src/xspice/cmpp/read_ifs.c index 498a58c21..41cae6111 100755 --- a/src/xspice/cmpp/read_ifs.c +++ b/src/xspice/cmpp/read_ifs.c @@ -153,7 +153,7 @@ static Status_t read_ifs_table( ifs_yylineno = 1; ifs_yyin = fp; - parser_just_names = (mode == GET_IFS_NAME); + parser_just_names = (mode == GET_IFS_NAME) ? TRUE : FALSE; parser_ifs_table = ifs_table; if (ifs_yyparse()) {