From 9973b3d1f8b031a3d0788dd1c64666ed9b11c2ca Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sat, 9 Aug 2014 19:38:14 +0200
Subject: [PATCH] xpressn.c, rename `define()' --> `nupa_define()'

---
 src/frontend/numparam/xpressn.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c
index b7791df4f..c5f02dcf0 100644
--- a/src/frontend/numparam/xpressn.c
+++ b/src/frontend/numparam/xpressn.c
@@ -480,7 +480,7 @@ del_attrib(void *e_p)
 
 
 static bool
-define(tdico *dico,
+nupa_define(tdico *dico,
        char *t,                 /* identifier to define */
        char op,                 /* option */
        char tpe,                /* type marker */
@@ -591,7 +591,7 @@ defsubckt(tdico *dico, char *s, int w, char categ)
         SPICE_DSTRING ustr;     /* temp user string */
         spice_dstring_init(&ustr);
         pscopy_up(&ustr, s, i, j - i);
-        err = define(dico, spice_dstring_value(&ustr), ' ', categ, 0.0, w, NULL, NULL);
+        err = nupa_define(dico, spice_dstring_value(&ustr), ' ', categ, 0.0, w, NULL, NULL);
         spice_dstring_free(&ustr);
     } else {
         err = message(dico, "Subcircuit or Model without name.\n");
@@ -1800,7 +1800,7 @@ nupa_assignment(tdico *dico, char *s, char mode)
                 wval = i;
             }
 
-            err = define(dico, spice_dstring_value(&tstr), mode /* was ' ' */ ,
+            err = nupa_define(dico, spice_dstring_value(&tstr), mode /* was ' ' */ ,
                          dtype, rval, wval, NULL, NULL);
             error = error || err;
         }