From 9a5ac6380d550b7a7d3184b535aa5ed94f243319 Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Wed, 23 May 2018 14:36:30 +0200
Subject: [PATCH] do not assume any particualr size of VAL field

---
 src/StreamEpics.cc        | 4 ----
 src/devmbbiDirectStream.c | 2 +-
 src/devmbbiStream.c       | 8 ++++----
 src/devmbboDirectStream.c | 2 +-
 src/devmbboStream.c       | 8 ++++----
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/StreamEpics.cc b/src/StreamEpics.cc
index b5dd9bd..4d24115 100644
--- a/src/StreamEpics.cc
+++ b/src/StreamEpics.cc
@@ -273,9 +273,7 @@ static void streamRegistrar ()
         (REGISTRYFUNCTION)streamReloadSub);
 }
 
-extern "C" {
 epicsExportRegistrar(streamRegistrar);
-}
 #endif
 
 // driver support ////////////////////////////////////////////////////////
@@ -291,9 +289,7 @@ struct stream_drvsup {
 };
 
 #ifndef EPICS_3_13
-extern "C" {
 epicsExportAddress(drvet, stream);
-}
 #endif
 
 #ifdef EPICS_3_13
diff --git a/src/devmbbiDirectStream.c b/src/devmbbiDirectStream.c
index e20656b..45cc456 100644
--- a/src/devmbbiDirectStream.c
+++ b/src/devmbbiDirectStream.c
@@ -40,7 +40,7 @@ static long readData (dbCommon *record, format_t *format)
         else
         {
             /* No MASK, (NOBT = 0): use VAL field */
-            mbbiD->val = (unsigned short)val;
+            mbbiD->val = val;
             return DO_NOT_CONVERT;
         }
     }
diff --git a/src/devmbbiStream.c b/src/devmbbiStream.c
index 6aa2d3a..db3c96f 100644
--- a/src/devmbbiStream.c
+++ b/src/devmbbiStream.c
@@ -46,13 +46,13 @@ static long readData (dbCommon *record, format_t *format)
                     return OK;
                 }
             }
-            mbbi->val = (short)val;
+            mbbi->val = val;
             return DO_NOT_CONVERT;
         }
         case DBF_ENUM:
         {
             if (streamScanf (record, format, &val)) return ERROR;
-            mbbi->val = (short)val;
+            mbbi->val = val;
             return DO_NOT_CONVERT;
         }
         case DBF_STRING:
@@ -64,7 +64,7 @@ static long readData (dbCommon *record, format_t *format)
             {
                 if (strcmp ((&mbbi->zrst)[val], buffer) == 0)
                 {
-                    mbbi->val = (short)val;
+                    mbbi->val = val;
                     return DO_NOT_CONVERT;
                 }
             }
@@ -98,7 +98,7 @@ static long writeData (dbCommon *record, format_t *format)
         }
         case DBF_ENUM:
         {
-            return streamPrintf (record, format, (long) mbbi->val);
+            return streamPrintf (record, format, (long)mbbi->val);
         }
         case DBF_STRING:
         {
diff --git a/src/devmbboDirectStream.c b/src/devmbboDirectStream.c
index 108bbb2..32d3f24 100644
--- a/src/devmbboDirectStream.c
+++ b/src/devmbboDirectStream.c
@@ -42,7 +42,7 @@ static long readData (dbCommon *record, format_t *format)
         else
         {
             /* No MASK, (NOBT = 0): use VAL field */
-            mbboD->val = (short)val;
+            mbboD->val = val;
             return DO_NOT_CONVERT;
         }
     }
diff --git a/src/devmbboStream.c b/src/devmbboStream.c
index fd1e261..cb97ca8 100644
--- a/src/devmbboStream.c
+++ b/src/devmbboStream.c
@@ -47,13 +47,13 @@ static long readData (dbCommon *record, format_t *format)
                     return OK;
                 }
             }
-            mbbo->val = (short)val;
+            mbbo->val = val;
             return DO_NOT_CONVERT;
         }
         case DBF_ENUM:
         {
             if (streamScanf (record, format, &val)) return ERROR;
-            mbbo->val = (short)val;
+            mbbo->val = val;
             return DO_NOT_CONVERT;
         }
         case DBF_STRING:
@@ -65,7 +65,7 @@ static long readData (dbCommon *record, format_t *format)
             {
                 if (strcmp ((&mbbo->zrst)[val], buffer) == 0)
                 {
-                    mbbo->val = (short)val;
+                    mbbo->val = val;
                     return DO_NOT_CONVERT;
                 }
             }
@@ -101,7 +101,7 @@ static long writeData (dbCommon *record, format_t *format)
         }
         case DBF_ENUM:
         {
-            return streamPrintf (record, format, (long) mbbo->val);
+            return streamPrintf (record, format, (long)mbbo->val);
         }
         case DBF_STRING:
         {