From ead5832a1f99e95e6bab62c3c738871370b600e7 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Mon, 9 Jul 2012 12:39:00 -0500
Subject: [PATCH] Fix compiler errors on Solaris.

---
 src/ioc/db/chfPlugin.c | 3 ++-
 src/ioc/db/dbChannel.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/ioc/db/chfPlugin.c b/src/ioc/db/chfPlugin.c
index 4e58d1de7..4630edd0a 100644
--- a/src/ioc/db/chfPlugin.c
+++ b/src/ioc/db/chfPlugin.c
@@ -172,8 +172,9 @@ static int store_boolean_value(const chfPluginArgDef *opt, char *user, int val)
  * and store the result at 'user + opt->offset'.
  */
 static int
-store_double_value(const chfPluginArgDef *opt, void *user, double val)
+store_double_value(const chfPluginArgDef *opt, void *vuser, double val)
 {
+    char *user = vuser;
     epicsInt32 *ival;
     double *dval;
     char *sval;
diff --git a/src/ioc/db/dbChannel.c b/src/ioc/db/dbChannel.c
index 67f7a8018..52f2b754f 100644
--- a/src/ioc/db/dbChannel.c
+++ b/src/ioc/db/dbChannel.c
@@ -242,7 +242,7 @@ static void * chf_realloc(void *ctx, void *ptr, unsigned int sz)
 
 static void chf_free(void *ctx, void *ptr)
 {
-    return free(ptr);
+    free(ptr);
 }
 
 static const yajl_alloc_funcs chf_alloc =