From 0347bda93a1f251c8bc36d56d5dd9c02daf8af64 Mon Sep 17 00:00:00 2001
From: Arrigo Marchiori <ardovm@yahoo.it>
Date: 周五, 14 10月 2016 23:19:57 +0800
Subject: [PATCH] restore C99 compliance.

---
 libscpi/inc/scpi/types.h |    2 +-
 libscpi/src/units.c      |   18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libscpi/inc/scpi/types.h b/libscpi/inc/scpi/types.h
index de5e0d0..1a49402 100644
--- a/libscpi/inc/scpi/types.h
+++ b/libscpi/inc/scpi/types.h
@@ -328,7 +328,7 @@
         union {
             double value;
             int32_t tag;
-        };
+        } content;
         scpi_unit_t unit;
         int8_t base;
     };
diff --git a/libscpi/src/units.c b/libscpi/src/units.c
index 9fc2072..3a7b8c2 100644
--- a/libscpi/src/units.c
+++ b/libscpi/src/units.c
@@ -355,7 +355,7 @@
         return FALSE;
     }
 
-    value->value *= unitDef->mult;
+    value->content.value *= unitDef->mult;
     value->unit = unitDef->unit;
 
     return TRUE;
@@ -426,23 +426,23 @@
 
     switch (param.type) {
         case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA:
-            SCPI_ParamToDouble(context, &param, &(value->value));
+            SCPI_ParamToDouble(context, &param, &(value->content.value));
             break;
         case SCPI_TOKEN_HEXNUM:
-            SCPI_ParamToDouble(context, &param, &(value->value));
+            SCPI_ParamToDouble(context, &param, &(value->content.value));
             break;
         case SCPI_TOKEN_OCTNUM:
-            SCPI_ParamToDouble(context, &param, &(value->value));
+            SCPI_ParamToDouble(context, &param, &(value->content.value));
             break;
         case SCPI_TOKEN_BINNUM:
-            SCPI_ParamToDouble(context, &param, &(value->value));
+            SCPI_ParamToDouble(context, &param, &(value->content.value));
             break;
         case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA_WITH_SUFFIX:
             scpiLex_DecimalNumericProgramData(&state, &token);
             scpiLex_WhiteSpace(&state, &token);
             scpiLex_SuffixProgramData(&state, &token);
 
-            SCPI_ParamToDouble(context, &param, &(value->value));
+            SCPI_ParamToDouble(context, &param, &(value->content.value));
 
             result = transformNumber(context, token.ptr, token.len, value);
             break;
@@ -454,7 +454,7 @@
             result = SCPI_ParamToChoice(context, &token, special, &tag);
 
             value->special = TRUE;
-            value->tag = tag;
+            value->content.tag = tag;
 
             break;
         default:
@@ -482,7 +482,7 @@
     }
 
     if (value->special) {
-        if (SCPI_ChoiceToName(special, value->tag, &type)) {
+        if (SCPI_ChoiceToName(special, value->content.tag, &type)) {
             strncpy(str, type, len);
             result = SCPIDEFINE_strnlen(str, len - 1);
             str[result] = '\0';
@@ -493,7 +493,7 @@
         }
     }
 
-    result = SCPI_DoubleToStr(value->value, str, len);
+    result = SCPI_DoubleToStr(value->content.value, str, len);
 
     if (result + 1 < len) {
         unit = translateUnitInverse(context->units, value->unit);

--
Gitblit v1.9.1