===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/include/wchar.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/include/wchar.h	2011/06/01 16:39:07	1.17
--- src/include/wchar.h	2011/07/03 18:51:01	1.18
***************
*** 1,4 ****
! /*	$OpenBSD: wchar.h,v 1.17 2011/06/01 16:39:07 millert Exp $	*/
  /*	$NetBSD: wchar.h,v 1.16 2003/03/07 07:11:35 tshiozak Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: wchar.h,v 1.18 2011/07/03 18:51:01 jsg Exp $	*/
  /*	$NetBSD: wchar.h,v 1.16 2003/03/07 07:11:35 tshiozak Exp $	*/
  
  /*-
***************
*** 65,70 ****
--- 65,72 ----
  #ifndef	NULL
  #ifdef	__GNUG__
  #define	NULL	__null
+ #elif defined(__cplusplus)
+ #define	NULL	0L
  #else
  #define	NULL	((void *)0)
  #endif