===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/include/stdio.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -c -r1.39 -r1.40
*** src/include/stdio.h	2011/04/06 11:39:42	1.39
--- src/include/stdio.h	2011/07/03 18:51:01	1.40
***************
*** 1,4 ****
! /*	$OpenBSD: stdio.h,v 1.39 2011/04/06 11:39:42 miod Exp $	*/
  /*	$NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: stdio.h,v 1.40 2011/07/03 18:51:01 jsg Exp $	*/
  /*	$NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $	*/
  
  /*-
***************
*** 58,63 ****
--- 58,65 ----
  #ifndef NULL
  #ifdef 	__GNUG__
  #define	NULL	__null
+ #elif defined(__cplusplus)
+ #define	NULL	0L
  #else
  #define	NULL	((void *)0)
  #endif