From f210758bdb786b29d81edf9bd30fd35f27e98dc2 Mon Sep 17 00:00:00 2001 From: dwarning Date: Mon, 1 Mar 2010 10:28:22 +0000 Subject: [PATCH] applied patch to prevent sun cc warnings --- src/frontend/numparam/xpressn.c | 2 +- src/include/hash.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c index 61fafb49e..8dc123514 100644 --- a/src/frontend/numparam/xpressn.c +++ b/src/frontend/numparam/xpressn.c @@ -750,7 +750,7 @@ exists (tdico * d, char *s, int *pi, unsigned char *perror) { i = fetchid (s, &t, ls, i); i--; - if (entrynb (d, spice_dstring_value(&t)) > 0) + if (entrynb(d, spice_dstring_value(&t))) x = 1.0; do { diff --git a/src/include/hash.h b/src/include/hash.h index 810cc976e..22c3c4cab 100644 --- a/src/include/hash.h +++ b/src/include/hash.h @@ -77,8 +77,8 @@ typedef struct nghash_iter_rec { #define NGHASH_ITER_EQUAL(x_yz,y_yz) ( (x_yz)->position == (y_yz)->position ) #define NGHASH_DEF_HASH_STR NGHASH_FUNC_STR -#define NGHASH_DEF_HASH_PTR (void *) NGHASH_FUNC_PTR -#define NGHASH_DEF_HASH_NUM (void *) NGHASH_FUNC_NUM +#define NGHASH_DEF_HASH_PTR ((nghash_func) ((void *) NGHASH_FUNC_PTR)) +#define NGHASH_DEF_HASH_NUM ((nghash_func) ((void *) NGHASH_FUNC_NUM)) /* the default comparison functions */ #define NGHASH_DEF_CMP_STR NGHASH_FUNC_STR