o Merge <machine/ansi.h> and <machine/types.h> into a new header

  called <machine/_types.h>.
o <machine/ansi.h> will continue to live so it can define MD clock
  macros, which are only MD because of gratuitous differences between
  architectures.
o Change all headers to make use of this.  This mainly involves
  changing:
    #ifdef _BSD_FOO_T_
    typedef	_BSD_FOO_T_	foo_t;
    #undef _BSD_FOO_T_
    #endif
  to:
    #ifndef _FOO_T_DECLARED
    typedef	__foo_t	foo_t;
    #define	_FOO_T_DECLARED
    #endif

Concept by:	bde
Reviewed by:	jake, obrien

1 files changed, 4 insertions, 4 deletions

diff --git a/include/timeconv.h b/include/timeconv.h
index e76c4cd62d4c..cce937cf7e54 100644
--- a/include/timeconv.h
+++ b/include/timeconv.h
@@ -46,11 +46,11 @@
 #define	_TIMECONV_H_
 
 #include <sys/cdefs.h>
-#include <machine/ansi.h>
+#include <sys/_types.h>
 
-#ifdef	_BSD_TIME_T_
-typedef	_BSD_TIME_T_	time_t;
-#undef	_BSD_TIME_T_
+#ifndef _TIME_T_DECLARED
+typedef	__time_t	time_t;
+#define	_TIME_T_DECLARED
 #endif
 
 time_t _time32_to_time(__int32_t t32);