From c3d04fdd08a8ca56b363c7449df31a63a7aace77 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Thu, 5 Sep 2013 10:26:56 -0500
Subject: [PATCH] Fix VxWorks builds

---
 pvDataApp/pv/pvData.h | 5 +++++
 pvDataApp/pv/pvType.h | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pvDataApp/pv/pvData.h b/pvDataApp/pv/pvData.h
index 4f15742..c1ffbc8 100644
--- a/pvDataApp/pv/pvData.h
+++ b/pvDataApp/pv/pvData.h
@@ -18,6 +18,11 @@
 #include <iomanip>
 #include <pv/pvIntrospect.h>
 #include <pv/requester.h>
+
+#if defined(__vxworks) && !defined(_WRS_VXWORKS_MAJOR)
+typedef class std::ios std::ios_base;
+#endif
+
 namespace epics { namespace pvData { 
 
 
diff --git a/pvDataApp/pv/pvType.h b/pvDataApp/pv/pvType.h
index 93eb1f2..d25d40b 100644
--- a/pvDataApp/pv/pvType.h
+++ b/pvDataApp/pv/pvType.h
@@ -17,7 +17,8 @@
 #include <string>
 #include <vector>
 
-#ifdef __vxworks
+#if defined(__vxworks) && \
+    (_WRS_VXWORKS_MAJOR+0 <= 6) && (_WRS_VXWORKS_MINOR+0 < 9)
 typedef int intptr_t;
 typedef unsigned int uintptr_t;
 #define INT64_MAX (0x7fffffffffffffffLL)