From 161f3c7d3c89559c27975ed82f72d3c74c32ee1d Mon Sep 17 00:00:00 2001 From: zimoch Date: Fri, 30 Nov 2007 15:18:16 +0000 Subject: [PATCH] copy from main project --- src/StreamEpics.cc | 4 ++-- src/devaaiStream.c | 2 +- src/devaaoStream.c | 2 +- src/devaiStream.c | 2 +- src/devaoStream.c | 2 +- src/devbiStream.c | 2 +- src/devboStream.c | 2 +- src/devcalcoutStream.c | 2 +- src/devlonginStream.c | 2 +- src/devlongoutStream.c | 2 +- src/devmbbiDirectStream.c | 2 +- src/devmbbiStream.c | 2 +- src/devmbboDirectStream.c | 2 +- src/devmbboStream.c | 2 +- src/devstringinStream.c | 2 +- src/devstringoutStream.c | 2 +- src/devwaveformStream.c | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/StreamEpics.cc b/src/StreamEpics.cc index 2d914e3..a54f72b 100644 --- a/src/StreamEpics.cc +++ b/src/StreamEpics.cc @@ -1180,11 +1180,11 @@ void streamExecuteCommand(CALLBACK *pcallback) if (execute(pstream->outputLine()) != OK) { - pstream->execCallback(StreamBusInterface::ioFault); + pstream->execCallback(StreamIoFault); } else { - pstream->execCallback(StreamBusInterface::ioSuccess); + pstream->execCallback(StreamIoSuccess); } } #endif diff --git a/src/devaaiStream.c b/src/devaaiStream.c index b2a76cb..958482d 100644 --- a/src/devaaiStream.c +++ b/src/devaaiStream.c @@ -20,7 +20,7 @@ #include #include -#include +#include "devStream.h" #include #include diff --git a/src/devaaoStream.c b/src/devaaoStream.c index eba6eff..682acb9 100644 --- a/src/devaaoStream.c +++ b/src/devaaoStream.c @@ -20,7 +20,7 @@ #include #include -#include +#include "devStream.h" #include #include diff --git a/src/devaiStream.c b/src/devaiStream.c index ebfcb31..a33fad8 100644 --- a/src/devaiStream.c +++ b/src/devaiStream.c @@ -18,7 +18,7 @@ * * ***************************************************************/ -#include +#include "devStream.h" #include #include diff --git a/src/devaoStream.c b/src/devaoStream.c index 54ba9f2..6c378e3 100644 --- a/src/devaoStream.c +++ b/src/devaoStream.c @@ -18,7 +18,7 @@ * * ***************************************************************/ -#include +#include "devStream.h" #include #include diff --git a/src/devbiStream.c b/src/devbiStream.c index 3e7d973..94d6bf2 100644 --- a/src/devbiStream.c +++ b/src/devbiStream.c @@ -18,7 +18,7 @@ * * ***************************************************************/ -#include +#include "devStream.h" #include #include #include diff --git a/src/devboStream.c b/src/devboStream.c index 3aac446..2fa2484 100644 --- a/src/devboStream.c +++ b/src/devboStream.c @@ -18,7 +18,7 @@ * * ***************************************************************/ -#include +#include "devStream.h" #include #include #include diff --git a/src/devcalcoutStream.c b/src/devcalcoutStream.c index ce698d1..0192b71 100644 --- a/src/devcalcoutStream.c +++ b/src/devcalcoutStream.c @@ -17,7 +17,7 @@ * * ***************************************************************/ -#include +#include "devStream.h" #include #include #include diff --git a/src/devlonginStream.c b/src/devlonginStream.c index dac7d86..50cbe43 100644 --- a/src/devlonginStream.c +++ b/src/devlonginStream.c @@ -18,7 +18,7 @@ * * ***************************************************************/ -#include +#include "devStream.h" #include #include diff --git a/src/devlongoutStream.c b/src/devlongoutStream.c index 84863a3..228b48c 100644 --- a/src/devlongoutStream.c +++ b/src/devlongoutStream.c @@ -19,7 +19,7 @@ * * ***************************************************************/ -#include +#include "devStream.h" #include #include diff --git a/src/devmbbiDirectStream.c b/src/devmbbiDirectStream.c index 084519b..4a292d3 100644 --- a/src/devmbbiDirectStream.c +++ b/src/devmbbiDirectStream.c @@ -19,7 +19,7 @@ * * ***************************************************************/ -#include +#include "devStream.h" #include #include diff --git a/src/devmbbiStream.c b/src/devmbbiStream.c index b8c0f6c..8f56f2f 100644 --- a/src/devmbbiStream.c +++ b/src/devmbbiStream.c @@ -19,7 +19,7 @@ * * ***************************************************************/ -#include +#include "devStream.h" #include #include #include diff --git a/src/devmbboDirectStream.c b/src/devmbboDirectStream.c index 436dfc9..5973093 100644 --- a/src/devmbboDirectStream.c +++ b/src/devmbboDirectStream.c @@ -19,7 +19,7 @@ * * ***************************************************************/ -#include +#include "devStream.h" #include #include diff --git a/src/devmbboStream.c b/src/devmbboStream.c index e7b9e73..174696f 100644 --- a/src/devmbboStream.c +++ b/src/devmbboStream.c @@ -19,7 +19,7 @@ * * ***************************************************************/ -#include +#include "devStream.h" #include #include #include diff --git a/src/devstringinStream.c b/src/devstringinStream.c index 0fd6f69..beef129 100644 --- a/src/devstringinStream.c +++ b/src/devstringinStream.c @@ -18,7 +18,7 @@ * * ***************************************************************/ -#include +#include "devStream.h" #include #include diff --git a/src/devstringoutStream.c b/src/devstringoutStream.c index 39a72ec..e5b3a12 100644 --- a/src/devstringoutStream.c +++ b/src/devstringoutStream.c @@ -18,7 +18,7 @@ * * ***************************************************************/ -#include +#include "devStream.h" #include #include diff --git a/src/devwaveformStream.c b/src/devwaveformStream.c index 5fe3c89..70e0291 100644 --- a/src/devwaveformStream.c +++ b/src/devwaveformStream.c @@ -18,7 +18,7 @@ * * ***************************************************************/ -#include +#include "devStream.h" #include #include #include