From 1970e4104125a11720469a19926d591e49c7f00b Mon Sep 17 00:00:00 2001
From: steve <steve>
Date: Tue, 13 Jan 2004 02:55:50 +0000
Subject: [PATCH]  Get value for vpoiConstType correct.

---
 parse.y    | 14 +++++++-------
 vpi_user.h |  7 +++++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/parse.y b/parse.y
index 9f53dd4f5..c39c59b06 100644
--- a/parse.y
+++ b/parse.y
@@ -19,7 +19,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: parse.y,v 1.186 2003/12/19 05:15:04 steve Exp $"
+#ident "$Id: parse.y,v 1.187 2004/01/13 02:55:50 steve Exp $"
 #endif
 
 # include "config.h"
@@ -53,12 +53,12 @@ static struct {
    YYLLOC_DEFAULT macro that makes up a yylloc value from existing
    values. I need to supply an explicit version to account for the
    text field, that otherwise won't be copied. */
-# define YYLLOC_DEFAULT(Current, Rhs, N)         \
-  Current.first_line   = Rhs[1].first_line;      \
-  Current.first_column = Rhs[1].first_column;    \
-  Current.last_line    = Rhs[N].last_line;       \
-  Current.last_column  = Rhs[N].last_column;     \
-  Current.text         = Rhs[1].text;
+# define YYLLOC_DEFAULT(Current, Rhs, N)  do {       \
+  (Current).first_line   = (Rhs)[1].first_line;      \
+  (Current).first_column = (Rhs)[1].first_column;    \
+  (Current).last_line    = (Rhs)[N].last_line;       \
+  (Current).last_column  = (Rhs)[N].last_column;     \
+  (Current).text         = (Rhs)[1].text;   } while (0)
 
 /*
  * These are some common strength pairs that are used as defaults when
diff --git a/vpi_user.h b/vpi_user.h
index c7e2450ec..75c576a4f 100644
--- a/vpi_user.h
+++ b/vpi_user.h
@@ -19,7 +19,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: vpi_user.h,v 1.31 2003/12/07 20:06:24 steve Exp $"
+#ident "$Id: vpi_user.h,v 1.32 2004/01/13 02:55:50 steve Exp $"
 #endif
 
 
@@ -192,7 +192,7 @@ typedef struct t_vpi_value {
 #define vpiTimePrecision 12
 #define vpiNetType    22
 #   define vpiWire        1
-#define vpiConstType 43
+#define vpiConstType 40
 #   define vpiDecConst    1
 #   define vpiRealConst   2
 #   define vpiBinaryConst 3
@@ -412,6 +412,9 @@ EXTERN_C_END
 
 /*
  * $Log: vpi_user.h,v $
+ * Revision 1.32  2004/01/13 02:55:50  steve
+ *  Get value for vpoiConstType correct.
+ *
  * Revision 1.31  2003/12/07 20:06:24  steve
  *  tfname can be constant.
  *