move struct timespec into its own header

sys/stat.h needs to define struct timespec without polluting the
namespace with all <time.h> content, so factor out struct timespec into
its own header and use it at the appropriate places.

diff --git a/include/time.h b/include/time.h
index 5f0fd77..6df6671 100644 (file)
--- a/include/time.h
+++ b/include/time.h
@@ -92,13 +92,8 @@ typedef      __clockid_t     clockid_t;
 typedef        __timer_t       timer_t;
 #endif
 
-#ifndef _TIMESPEC_DECLARED
-#define _TIMESPEC_DECLARED
-struct timespec {
-       time_t  tv_sec;         /* seconds */
-       long    tv_nsec;        /* and nanoseconds */
-};
-#endif
+#include <sys/_timespec.h>
+
 #endif /* __POSIX_VISIBLE >= 199309 */
 
 /* These macros are also in sys/time.h. */

diff --git a/sys/sys/_timespec.h b/sys/sys/_timespec.h
new file mode 100644 (file)
index 0000000..50a33e3
--- /dev/null
+++ b/sys/sys/_timespec.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2008 The DragonFly Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of The DragonFly Project nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific, prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef        _SYS__TIMESPEC_H_
+#define        _SYS__TIMESPEC_H_
+
+#include <sys/types.h>
+
+struct timespec {
+       time_t  tv_sec;         /* seconds */
+       long    tv_nsec;        /* and nanoseconds */
+};
+
+#endif /* _SYS__TIMEVAL_H_ */

diff --git a/sys/sys/stat.h b/sys/sys/stat.h
index 5573bd5..f0377e2 100644 (file)
--- a/sys/sys/stat.h
+++ b/sys/sys/stat.h
@@ -47,6 +47,8 @@
 #ifndef _SYS_TIME_H_
 #include <sys/time.h>
 #endif
+#else  /* !_POSIX_SOURCE */
+#include <sys/_timespec.h>
 #endif /* _POSIX_SOURCE */
 
 #ifdef _KERNEL

diff --git a/sys/sys/time.h b/sys/sys/time.h
index 240e9b7..af6c630 100644 (file)
--- a/sys/sys/time.h
+++ b/sys/sys/time.h
@@ -42,17 +42,10 @@
 #include <sys/types.h>
 #endif
 
+#include <sys/_timespec.h>
 #include <sys/_timeval.h>
 #include <sys/select.h>
 
-#ifndef _TIMESPEC_DECLARED
-#define _TIMESPEC_DECLARED
-struct timespec {
-       time_t  tv_sec;         /* seconds */
-       long    tv_nsec;        /* and nanoseconds */
-};
-#endif
-
 #define        TIMEVAL_TO_TIMESPEC(tv, ts)                                     \
        do {                                                            \
                (ts)->tv_sec = (tv)->tv_sec;                            \