From da6790e68dab51d709169c8bd7ac5f9d6dc98f60 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sat, 24 May 2014 12:54:01 +0200
Subject: [PATCH] numparam, change np_trunc() and np_round() return type to
 double

---
 src/frontend/numparam/general.h  |  4 ++--
 src/frontend/numparam/mystring.c | 10 +++++-----
 src/frontend/numparam/xpressn.c  |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/frontend/numparam/general.h b/src/frontend/numparam/general.h
index f9e01eb87..2de71a962 100644
--- a/src/frontend/numparam/general.h
+++ b/src/frontend/numparam/general.h
@@ -47,8 +47,8 @@ char rc(void);
 
 int freadstr(FILE *f, SPICE_DSTRINGPTR dstr_p);
 
-long np_round(double d);        // sjb to avoid clash with round() in math.h
-long np_trunc(double x);        // sjb to avoid clash with trunc() in math.h
+double np_round(double d);        // sjb to avoid clash with round() in math.h
+double np_trunc(double x);        // sjb to avoid clash with trunc() in math.h
 double absf(double x); /* abs */
 long absi(long i);
 
diff --git a/src/frontend/numparam/mystring.c b/src/frontend/numparam/mystring.c
index aad579fa6..7028468ba 100644
--- a/src/frontend/numparam/mystring.c
+++ b/src/frontend/numparam/mystring.c
@@ -599,18 +599,18 @@ spos_(char *sub, const char *s)
 }
 
 
-long
+double
 np_round(double r)
 {
-    return (long) floor(r + 0.5);
+    return floor(r + 0.5);
 }
 
 
-long
+double
 np_trunc(double r)
 {
     if (r >= 0.0)
-        return (long) floor(r);
+        return floor(r);
     else
-        return (long) ceil(r);
+        return ceil(r);
 }
diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c
index cf0f2af20..b7791df4f 100644
--- a/src/frontend/numparam/xpressn.c
+++ b/src/frontend/numparam/xpressn.c
@@ -979,11 +979,11 @@ operate(char op, double x, double y)
             x = z;
         break;
     case '%':                   /* % */
-        t = (double)(np_trunc(x / y));
+        t = np_trunc(x / y);
         x = x - y * t;
         break;
     case '\\':                  /* / */
-        x = (double)(np_trunc(fabs(x / y)));
+        x = np_trunc(fabs(x / y));
         break;
     }