From 9079c8aa538f991b415db43bf5b1c7fec5d0d32f Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Mon, 18 Aug 2014 22:55:07 -0500
Subject: [PATCH] Reverted changes to epicsTime.h and epicsThread.h

---
 src/libCom/osi/epicsThread.h |  9 +--------
 src/libCom/osi/epicsTime.h   | 18 ++++++------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/libCom/osi/epicsThread.h b/src/libCom/osi/epicsThread.h
index 9102ec734..d7be5d197 100644
--- a/src/libCom/osi/epicsThread.h
+++ b/src/libCom/osi/epicsThread.h
@@ -10,12 +10,7 @@
 #ifndef epicsThreadh
 #define epicsThreadh
 
-#ifdef __cplusplus
-#include <cstddef>
-using std :: size_t;
-#else
 #include <stddef.h>
-#endif
 
 #include "shareLib.h"
 
@@ -43,9 +38,7 @@ typedef void (*EPICSTHREADFUNC)(void *parm);
 
 /* stack sizes for each stackSizeClass are implementation and CPU dependent */
 typedef enum {
-    epicsThreadStackSmall,
-    epicsThreadStackMedium, 
-    epicsThreadStackBig
+    epicsThreadStackSmall, epicsThreadStackMedium, epicsThreadStackBig
 } epicsThreadStackSizeClass;
 
 typedef enum {
diff --git a/src/libCom/osi/epicsTime.h b/src/libCom/osi/epicsTime.h
index 3f83d74d4..a36d6afe3 100644
--- a/src/libCom/osi/epicsTime.h
+++ b/src/libCom/osi/epicsTime.h
@@ -12,11 +12,7 @@
 #ifndef epicsTimehInclude
 #define epicsTimehInclude
 
-#ifdef __cplusplus
-#   include <ctime>
-#else
-#   include <time.h>
-#endif
+#include <time.h>
 
 #include "shareLib.h"
 #include "epicsTypes.h"
@@ -46,7 +42,7 @@ struct l_fp; /* NTP timestamp */
  * and a struct tm that is adjusted for the local timezone
  */
 struct local_tm_nano_sec {
-    std :: tm ansi_tm; /* ANSI C time details */
+    struct tm ansi_tm; /* ANSI C time details */
     unsigned long nSec; /* nano seconds extension */
 };
 
@@ -55,7 +51,7 @@ struct local_tm_nano_sec {
  * and a struct tm that is adjusted for GMT (UTC)
  */
 struct gm_tm_nano_sec {
-    std :: tm ansi_tm; /* ANSI C time details */
+    struct tm ansi_tm; /* ANSI C time details */
     unsigned long nSec; /* nano seconds extension */
 };
 
@@ -65,7 +61,7 @@ struct gm_tm_nano_sec {
  * conversions to occur
  */
 struct time_t_wrapper {
-    std :: time_t ts;
+    time_t ts;
 };
 
 class epicsShareClass epicsTimeEvent
@@ -248,10 +244,8 @@ epicsShareFunc void epicsShareAPI epicsTimeShow (
 
 /* OS dependent reentrant versions of the ANSI C interface because */
 /* vxWorks gmtime_r interface does not match POSIX standards */
-epicsShareFunc int epicsShareAPI 
-    epicsTime_localtime ( const time_t * clock, struct tm * result );
-epicsShareFunc int epicsShareAPI 
-    epicsTime_gmtime ( const time_t * clock, struct tm * result );
+epicsShareFunc int epicsShareAPI epicsTime_localtime ( const time_t * clock, struct tm * result );
+epicsShareFunc int epicsShareAPI epicsTime_gmtime ( const time_t * clock, struct tm * result );
 
 #ifdef __cplusplus
 }