From c730c64c345ef116c3a9ad46a3f7f06e32f2ad8a Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Wed, 26 Jan 2000 01:33:13 +0000
Subject: [PATCH] fixed timespec already defined on linux

---
 src/libCom/osi/os/RTEMS/osdTime.h   | 13 +++++++++++++
 src/libCom/osi/os/VMS/osdTime.h     | 19 +++++++++++++++++++
 src/libCom/osi/os/WIN32/osdTime.h   | 19 +++++++++++++++++++
 src/libCom/osi/os/vxWorks/osdTime.h | 13 +++++++++++++
 src/libCom/osi/osiTime.cpp          | 19 ++-----------------
 src/libCom/osi/osiTime.h            |  2 ++
 6 files changed, 68 insertions(+), 17 deletions(-)
 create mode 100644 src/libCom/osi/os/RTEMS/osdTime.h
 create mode 100644 src/libCom/osi/os/VMS/osdTime.h
 create mode 100644 src/libCom/osi/os/WIN32/osdTime.h
 create mode 100644 src/libCom/osi/os/vxWorks/osdTime.h

diff --git a/src/libCom/osi/os/RTEMS/osdTime.h b/src/libCom/osi/os/RTEMS/osdTime.h
new file mode 100644
index 000000000..d2674e177
--- /dev/null
+++ b/src/libCom/osi/os/RTEMS/osdTime.h
@@ -0,0 +1,13 @@
+
+/*
+ * $Id$
+ *
+ * Author: Jeff Hill
+ */
+
+#ifndef osdTimeh
+#define osdTimeh
+
+/* NOOP */
+
+#endif /* ifndef osdTimeh */
\ No newline at end of file
diff --git a/src/libCom/osi/os/VMS/osdTime.h b/src/libCom/osi/os/VMS/osdTime.h
new file mode 100644
index 000000000..bd108e22d
--- /dev/null
+++ b/src/libCom/osi/os/VMS/osdTime.h
@@ -0,0 +1,19 @@
+
+/*
+ * $Id$
+ *
+ * Author: Jeff Hill
+ */
+
+#ifndef osdTimeh
+#define osdTimeh
+
+/*
+ * I assume that this is never defined on VMS ?
+ */
+struct timespec {
+	time_t tv_sec; /* seconds since some epoch */
+	long tv_nsec; /* nanoseconds within the second */
+};
+
+#endif /* ifndef osdTimeh */
\ No newline at end of file
diff --git a/src/libCom/osi/os/WIN32/osdTime.h b/src/libCom/osi/os/WIN32/osdTime.h
new file mode 100644
index 000000000..3d4fd4088
--- /dev/null
+++ b/src/libCom/osi/os/WIN32/osdTime.h
@@ -0,0 +1,19 @@
+
+/*
+ * $Id$
+ *
+ * Author: Jeff Hill
+ */
+
+#ifndef osdTimeh
+#define osdTimeh
+
+/*
+ * this is not defined by WIN32
+ */
+struct timespec {
+	time_t tv_sec; /* seconds since some epoch */
+	long tv_nsec; /* nanoseconds within the second */
+};
+
+#endif /* ifndef osdTimeh */
\ No newline at end of file
diff --git a/src/libCom/osi/os/vxWorks/osdTime.h b/src/libCom/osi/os/vxWorks/osdTime.h
new file mode 100644
index 000000000..d2674e177
--- /dev/null
+++ b/src/libCom/osi/os/vxWorks/osdTime.h
@@ -0,0 +1,13 @@
+
+/*
+ * $Id$
+ *
+ * Author: Jeff Hill
+ */
+
+#ifndef osdTimeh
+#define osdTimeh
+
+/* NOOP */
+
+#endif /* ifndef osdTimeh */
\ No newline at end of file
diff --git a/src/libCom/osi/osiTime.cpp b/src/libCom/osi/osiTime.cpp
index 52c4915aa..85d6f486a 100644
--- a/src/libCom/osi/osiTime.cpp
+++ b/src/libCom/osi/osiTime.cpp
@@ -46,23 +46,8 @@ const unsigned osiTime::nSecPerSec = 1000u*osiTime::uSecPerSec;
 const unsigned osiTime::nSecPerUSec = 1000u;
 const unsigned osiTime::secPerMin = 60u;
 
-//
-// this is defined by POSIX 1003.1b (POSIX real time) compilant OS
-//
-#ifndef CLOCK_REALTIME
-
-	//
-	// this is part of the POSIX RT standard but some OS 
-	// still do not define this in time.h 
-	//
-	struct timespec {
-		time_t tv_sec; /* seconds since some epoch */
-		long tv_nsec; /* nanoseconds within the second */
-	};
-
-	struct tm *gmtime_r (const time_t *, struct tm *);
-	struct tm *localtime_r (const time_t *, struct tm *);
-#endif
+struct tm *gmtime_r (const time_t *, struct tm *);
+struct tm *localtime_r (const time_t *, struct tm *);
 
 static const unsigned ntpEpochYear = 1900;
 static const unsigned ntpEpocMonth = 0; // January
diff --git a/src/libCom/osi/osiTime.h b/src/libCom/osi/osiTime.h
index 1a652bde2..fe6cec424 100644
--- a/src/libCom/osi/osiTime.h
+++ b/src/libCom/osi/osiTime.h
@@ -380,5 +380,7 @@ inline osiTime osiTime::operator = (const time_t_wrapper &rhs)
 	return *this;
 }
 
+#include "osdTime.h"
+
 #endif // osiTimehInclude