From 2d520674842e4e4b177ac217890d349c091e3c0d Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Tue, 19 Nov 2013 15:26:22 -0600
Subject: [PATCH] libCom: Clean up build warnings from Visual Studio.

---
 src/libCom/calc/postfix.c   | 10 +++++-----
 src/libCom/macLib/macUtil.c |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/libCom/calc/postfix.c b/src/libCom/calc/postfix.c
index 168c0f03d..ca25bea42 100644
--- a/src/libCom/calc/postfix.c
+++ b/src/libCom/calc/postfix.c
@@ -205,7 +205,7 @@ static int
  * convert an infix expression to a postfix expression
  */
 epicsShareFunc long
-    postfix(const char *psrc, char * const ppostfix, short *perror)
+    postfix(const char *psrc, char *pout, short *perror)
 {
     ELEMENT stack[80];
     ELEMENT *pstacktop = stack;
@@ -213,7 +213,7 @@ epicsShareFunc long
     int operand_needed = TRUE;
     int runtime_depth = 0;
     int cond_count = 0;
-    char *pout = ppostfix;
+    char * const pdest = pout;
     char *pnext;
     double lit_d;
     int lit_i;
@@ -249,7 +249,7 @@ epicsShareFunc long
                     goto bad;
                 }
                 psrc = pnext;
-                lit_i = lit_d;
+                lit_i = (int) lit_d;
                 if (lit_d != (double) lit_i) {
                     *pout++ = pel->code;
                     memcpy(pout, (void *)&lit_d, sizeof(double));
@@ -276,7 +276,7 @@ epicsShareFunc long
             break;
 
 	case STORE_OPERATOR:
-	    if (pout == ppostfix || pstacktop > stack ||
+	    if (pout == pdest || pstacktop > stack ||
 		*--pout < FETCH_A || *pout > FETCH_L) {
 		*perror = CALC_ERR_BAD_ASSIGNMENT;
 		goto bad;
@@ -477,7 +477,7 @@ epicsShareFunc long
     return 0;
 
 bad:
-    *ppostfix = END_EXPRESSION;
+    *pdest = END_EXPRESSION;
     return -1;
 }
 
diff --git a/src/libCom/macLib/macUtil.c b/src/libCom/macLib/macUtil.c
index a18d36037..ee7b53f7f 100644
--- a/src/libCom/macLib/macUtil.c
+++ b/src/libCom/macLib/macUtil.c
@@ -225,8 +225,8 @@ epicsShareAPI macParseDefns(
     }
 
     /* free workspace */
-    free( ptr );
-    free( end );
+    free( ( void * ) ptr );
+    free( ( void * ) end );
     free( ( char * ) del );
 
     /* debug output */
@@ -239,8 +239,8 @@ epicsShareAPI macParseDefns(
     /* error exit */
 error:
     errlogPrintf( "macParseDefns: failed to allocate memory\n" );
-    if ( ptr != NULL ) free( ptr );
-    if ( end != NULL ) free( end );
+    if ( ptr != NULL ) free( ( void * ) ptr );
+    if ( end != NULL ) free( ( void * ) end );
     if ( del != NULL ) free( ( char * ) del );
     *pairs = NULL;
     return -1;