===================================================================
RCS file: /cvs/prex-old/usr/include/stddef.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- prex-old/usr/include/stddef.h	2008/06/03 10:38:47	1.1.1.1
+++ prex-old/usr/include/stddef.h	2008/08/13 17:12:36	1.1.1.1.2.1
@@ -32,25 +32,22 @@
 #ifndef _STDDEF_H_
 #define _STDDEF_H_
 
-#include <machine/ansi.h>
-
-typedef	_BSD_PTRDIFF_T_	ptrdiff_t;
-
-#ifdef	_BSD_SIZE_T_
-typedef	_BSD_SIZE_T_	size_t;
-#undef	_BSD_SIZE_T_
+#if !defined(_SIZE_T)
+#define _SIZE_T
+typedef	unsigned int	size_t;		/* size of something in bytes */
 #endif
 
-#ifdef	_BSD_WCHAR_T_
-#ifndef _ANSI_SOURCE
-typedef	_BSD_WCHAR_T_	rune_t;
+#if !defined(_WCHAR_T)
+#define _WCHAR_T
+typedef int		wchar_t;
 #endif
-typedef	_BSD_WCHAR_T_	wchar_t;
-#undef	_BSD_WCHAR_T_
-#endif
 
 #ifndef	NULL
+#if !defined(__cplusplus)
+#define	NULL	((void *)0)
+#else
 #define	NULL	0
+#endif
 #endif
 
 #define	offsetof(type, member)	((size_t)(&((type *)0)->member))