===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/include/wchar.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -c -r1.29 -r1.30
*** src/include/wchar.h	2015/04/04 18:05:05	1.29
--- src/include/wchar.h	2016/09/09 18:12:37	1.30
***************
*** 1,4 ****
! /*	$OpenBSD: wchar.h,v 1.29 2015/04/04 18:05:05 guenther Exp $	*/
  /*	$NetBSD: wchar.h,v 1.16 2003/03/07 07:11:35 tshiozak Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: wchar.h,v 1.30 2016/09/09 18:12:37 millert Exp $	*/
  /*	$NetBSD: wchar.h,v 1.16 2003/03/07 07:11:35 tshiozak Exp $	*/
  
  /*-
***************
*** 60,76 ****
  #define _WCHAR_H_
  
  #include <sys/cdefs.h>
  #include <sys/_types.h>
- 
- #ifndef	NULL
- #ifdef	__GNUG__
- #define	NULL	__null
- #elif defined(__cplusplus)
- #define	NULL	0L
- #else
- #define	NULL	((void *)0)
- #endif
- #endif
  
  #include <stdio.h> /* for FILE* */
  
--- 60,67 ----
  #define _WCHAR_H_
  
  #include <sys/cdefs.h>
+ #include <sys/_null.h>
  #include <sys/_types.h>
  
  #include <stdio.h> /* for FILE* */