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, 9 insertions, 9 deletions

diff --git a/include/pwd.h b/include/pwd.h
index b038fa7d44ac..40082c3da670 100644
--- a/include/pwd.h
+++ b/include/pwd.h
@@ -45,19 +45,19 @@
 #include <sys/cdefs.h>
 #include <sys/_types.h>
 
-#ifdef _BSD_GID_T_
-typedef	_BSD_GID_T_	gid_t;
-#undef _BSD_GID_T_
+#ifndef _GID_T_DECLARED
+typedef	__gid_t		gid_t;
+#define	_GID_T_DECLARED
 #endif
 
-#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
 
-#ifdef _BSD_UID_T_
-typedef	_BSD_UID_T_	uid_t;
-#undef _BSD_UID_T_
+#ifndef _UID_T_DECLARED
+typedef	__uid_t		uid_t;
+#define	_UID_T_DECLARED
 #endif
 
 #define _PATH_PWD		"/etc"