Use epicsTypes.h for Base version related conditions

- fixes #44
- follows M. Davidsaver's suggestions for the original fix

Author: ralphlange

caPutLogApp/Makefile

@@ -28,9 +28,8 @@ INC += caPutLogAs.h
 DBD += caPutLog.dbd
 
 # Add support for json format and arrays
-# This requires EPICS base version 7.0.1 or higher
+# This requires EPICS 7
 ifdef BASE_7_0
-USR_CPPFLAGS += -DJSON_AND_ARRAYS_SUPPORTED
 caPutLog_SRCS += caPutJsonLogTask.cpp
 caPutLog_SRCS += caPutJsonLogShellCommands.cpp
 INC += caPutJsonLogTask.h

caPutLogApp/caPutLogAs.c

@@ -51,9 +51,7 @@
 #include <asTrapWrite.h>
 #include <epicsVersion.h>
 
-#define BASE_3_14 (EPICS_VERSION * 100 + EPICS_REVISION < 315)
-
-#if !(BASE_3_14)
+#if EPICS_VERSION_INT >= VERSION_INT(3,15,0,0)
 #include "dbChannel.h"
 #endif
 
@@ -114,7 +112,7 @@ void caPutLogAsStop()
 
 static void caPutLogAs(asTrapWriteMessage *pmessage, int afterPut)
 {
-#if BASE_3_14
+#if EPICS_VERSION_INT < VERSION_INT(3,15,0,0)
     dbAddr *paddr = pmessage->serverSpecific;
 #else
     struct dbChannel *pchan = pmessage->serverSpecific;
@@ -143,7 +141,7 @@ static void caPutLogAs(asTrapWriteMessage *pmessage, int afterPut)
 
         epicsSnprintf(plogData->userid, MAX_USERID_SIZE, "%s", pmessage->userid);
         epicsSnprintf(plogData->hostid, MAX_HOSTID_SIZE, "%s", pmessage->hostid);
-#if BASE_3_14
+#if EPICS_VERSION_INT < VERSION_INT(3,15,0,0)
         dbNameOfPV(paddr, plogData->pv_name, PVNAME_STRINGSZ);
 #else
         epicsSnprintf(plogData->pv_name, PVNAME_STRINGSZ, "%s", pv_name);
@@ -201,9 +199,7 @@ static void caPutLogAs(asTrapWriteMessage *pmessage, int afterPut)
 
 int caPutLogMaxArraySize(short type)
 {
-#if !JSON_AND_ARRAYS_SUPPORTED
-    return 1;
-#else
+#if EPICS_VERSION >= 7
     static int const arraySizeLookUpTable [] = {
         MAX_ARRAY_SIZE_BYTES/MAX_STRING_SIZE,       /* DBR_STRING */
         MAX_ARRAY_SIZE_BYTES/sizeof(epicsInt8),     /* DBR_CHAR */
@@ -222,9 +218,11 @@ int caPutLogMaxArraySize(short type)
     if (type >= DBR_STRING || type <= DBR_ENUM){
         return arraySizeLookUpTable[type];
     } else {
-        errlogSevPrintf(errlogMajor, "caPutLogAs: Array size for type %d can not be determind\n", type);
+        errlogSevPrintf(errlogMajor, "caPutLogAs: Array size for type %d can not be determined\n", type);
         return 1;
     }
+#else
+    return 1;
 #endif
 }
 

caPutLogApp/caPutLogTask.h

@@ -4,6 +4,7 @@
 #include <shareLib.h>
 #include <dbDefs.h>
 #include <epicsTime.h>
+#include <epicsVersion.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -12,7 +13,7 @@ extern "C" {
 #define MAX_USERID_SIZE 32
 #define MAX_HOSTID_SIZE 256
 
-#if JSON_AND_ARRAYS_SUPPORTED
+#if EPICS_VERSION >= 7
 #define MAX_ARRAY_SIZE_BYTES 400
 #else
 #define MAX_ARRAY_SIZE_BYTES 0
@@ -35,7 +36,7 @@ typedef union {
     epicsFloat64    v_double;
     char            v_string[MAX_STRING_SIZE];
 
-#if JSON_AND_ARRAYS_SUPPORTED
+#if EPICS_VERSION >= 7
     epicsInt8       a_int8[MAX_ARRAY_SIZE_BYTES/sizeof(epicsInt8)];
     epicsUInt8      a_uint8[MAX_ARRAY_SIZE_BYTES/sizeof(epicsUInt8)];
     epicsInt16      a_int16[MAX_ARRAY_SIZE_BYTES/sizeof(epicsInt16)];