*** empty log message ***

diff --git a/allParam/ca/Makefile b/allParam/ca/Makefile
index eec54fda0b3bed10b5f469269c628150e2c1a77d..3dcd3ec332fc3ed7d304022f43a346a31bb20102 100644 (file)
--- a/allParam/ca/Makefile
+++ b/allParam/ca/Makefile
@@ -1,4 +1,4 @@
-EPICS_BASE = $(EPICS_HOME)/base
+EPICS_BASE = $(EPICS_HOME)/R3.14.0.alpha1
 CFLAGS = -g -ansi -Wall -I$(EPICS_BASE)/include \
   -I$(EPICS_BASE)/include/os/$(HOST_ARCH)
 

diff --git a/allParam/ca/caParam.c b/allParam/ca/caParam.c
index c512adf8f0459b0b5efa2900b4b743600fa7f6af..34c35384089c23c1a7f23fcfaeda0fd4fbab7aff 100644 (file)
--- a/allParam/ca/caParam.c
+++ b/allParam/ca/caParam.c
@@ -107,12 +107,25 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
                status = ca_array_get_callback(ca_field_type(chan), ca_element_count(chan), chan, Param_copyToAllocMem, result);
                Param_strerror((Param *) my, ca_message(status));
 
-               if((status = ca_pend_event(TIMEOUT)) == ECA_TIMEOUT) {
-                       Param_strerror((Param *) my, ca_message(status));
-               } else if (status != ECA_NORMAL) {
-                       Param_strerror((Param *) my, ca_message(status));
-                       retVal = -1;
+#if 0
+               if(ca_test_io() == ECA_IOINPROGRESS) {
+#endif
+                       if((status = ca_pend_event(TIMEOUT)) == ECA_TIMEOUT) {
+                               Param_strerror((Param *) my, ca_message(status));
+                       } else if (status != ECA_NORMAL) {
+                               Param_strerror((Param *) my, ca_message(status));
+                               retVal = -1;
+                       }
+#if 0
+               } else {
+                       if((status = ca_poll()) == ECA_TIMEOUT) {
+                               Param_strerror((Param *) my, ca_message(status));
+                       } else if (status != ECA_NORMAL) {
+                               Param_strerror((Param *) my, ca_message(status));
+                               retVal = -1;
+                       }
                }
+#endif
        }
 
        if((status = ca_clear_channel(chan)) != ECA_NORMAL) {

diff --git a/allParam/ca/caParam.h b/allParam/ca/caParam.h
index 9fdeb70f2d45531ccd4303dfa5e9ed05bf2bbd50..5ff90281e518dfa9ba80ccd0ea3c856fc4154096 100644 (file)
--- a/allParam/ca/caParam.h
+++ b/allParam/ca/caParam.h
@@ -11,6 +11,8 @@
 
 #define TIMEOUT 0.2
 
+#ifndef STATESET_ST
+
 typedef struct ParamS {
        char *strerror;
 } Param;
@@ -39,3 +41,5 @@ const char *Param_getErrStr(const Param *);
 
 #endif
 
+#endif
+

diff --git a/allParam/file/fileParam.h b/allParam/file/fileParam.h
index 65b5078d7453a44ee7aa129ff3dd9224efa53d75..f4922abdcf62b086e2f422344a3f6fa698411775 100644 (file)
--- a/allParam/file/fileParam.h
+++ b/allParam/file/fileParam.h
@@ -11,6 +11,8 @@
 
 #define PARAM_MAX_NVALS 1024
 
+#ifndef STATESET_ST
+
 typedef struct ParamS {
        char *strerror;
        int nVals;
@@ -35,3 +37,5 @@ const char *Param_getErrStr(const Param *);
 
 #endif
 
+#endif
+

diff --git a/allParam/ora/oraParam.h b/allParam/ora/oraParam.h
index 9baaf93e24e8b9d9c4c595b7efa62be6ccf54fd0..371b6b116c6f65e8cb81c28935b534eaac37bd79 100644 (file)
--- a/allParam/ora/oraParam.h
+++ b/allParam/ora/oraParam.h
@@ -9,6 +9,8 @@
  * Section containing struct Param (different in the different param.h's) *
  **************************************************************************/
 
+#ifndef STATESET_ST
+
 typedef struct ParamS {
        const char *user;
        const char *passwd;
@@ -31,3 +33,5 @@ const char *Param_getErrStr(const Param *);
 
 #endif
 
+#endif
+

diff --git a/allParam/psql/psqlParam.h b/allParam/psql/psqlParam.h
index 6f4031fbc67a6f833f873564ee552422339911d4..0447fb669dd9ea5110c9f41599524cc88a1b4c3d 100644 (file)
--- a/allParam/psql/psqlParam.h
+++ b/allParam/psql/psqlParam.h
@@ -9,6 +9,8 @@
  * Section containing struct Param (different in the different param.h's) *
  **************************************************************************/
 
+#ifndef STATESET_ST
+
 #define PG_MAX_QUERY_LEN 1024
 #define PG_MAX_CLAUSE_LEN 256
 
@@ -32,3 +34,5 @@ const char *Param_getErrStr(const Param *);
 
 #endif
 
+#endif
+

diff --git a/allParam/tcl/tclParam.h b/allParam/tcl/tclParam.h
index 6f177bd9807aa344e82412218d7c8653ed57607b..e4b94510ce2c3d52d8e4a57835a21e0471e2f9c5 100644 (file)
--- a/allParam/tcl/tclParam.h
+++ b/allParam/tcl/tclParam.h
@@ -9,6 +9,8 @@
  * Section containing struct Param (different in the different param.h's) *
  **************************************************************************/
 
+#ifndef STATESET_ST
+
 #include <tcl.h>
 
 typedef struct ParamS {
@@ -32,3 +34,5 @@ const char *Param_getErrStr(const Param *);
 
 #endif
 
+#endif
+