===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/include/stddef.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** src/include/stddef.h	2011/07/03 18:51:01	1.12
--- src/include/stddef.h	2016/09/09 18:12:37	1.13
***************
*** 1,4 ****
! /*	$OpenBSD: stddef.h,v 1.12 2011/07/03 18:51:01 jsg Exp $	*/
  /*	$NetBSD: stddef.h,v 1.4 1994/10/26 00:56:26 cgd Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: stddef.h,v 1.13 2016/09/09 18:12:37 millert Exp $	*/
  /*	$NetBSD: stddef.h,v 1.4 1994/10/26 00:56:26 cgd Exp $	*/
  
  /*-
***************
*** 36,41 ****
--- 36,42 ----
  #define _STDDEF_H_
  
  #include <sys/cdefs.h>
+ #include <sys/_null.h>
  #include <sys/_types.h>
  
  #ifndef _PTRDIFF_T_DEFINED_
***************
*** 62,77 ****
  #ifndef	_MBSTATE_T_DEFINED_
  #define	_MBSTATE_T_DEFINED_
  typedef	__mbstate_t	mbstate_t;
- #endif
- 
- #ifndef	NULL
- #ifdef 	__GNUG__
- #define NULL	__null
- #elif defined(__cplusplus)
- #define	NULL	0L
- #else
- #define	NULL	((void *)0)
- #endif
  #endif
  
  #if __GNUC_PREREQ__(4, 0)
--- 63,68 ----