From fbc2f418900e61ad14e88807690dedcd213e4724 Mon Sep 17 00:00:00 2001
From: hades <hades>
Date: Mon, 6 Nov 2000 18:18:34 +0000
Subject: [PATCH] *** empty log message ***

---
 allParam/ca/Makefile      |  2 +-
 allParam/ca/caParam.c     | 23 ++++++++++++++++++-----
 allParam/ca/caParam.h     |  4 ++++
 allParam/file/fileParam.h |  4 ++++
 allParam/ora/oraParam.h   |  4 ++++
 allParam/psql/psqlParam.h |  4 ++++
 allParam/tcl/tclParam.h   |  4 ++++
 7 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/allParam/ca/Makefile b/allParam/ca/Makefile
index eec54fd..3dcd3ec 100644
--- 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 c512adf..34c3538 100644
--- 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 9fdeb70..5ff9028 100644
--- 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 65b5078..f4922ab 100644
--- 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 9baaf93..371b6b1 100644
--- 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 6f4031f..0447fb6 100644
--- 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 6f177bd..e4b9451 100644
--- 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
+
-- 
2.43.0