===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/include/unistd.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -c -r1.63 -r1.64
*** src/include/unistd.h	2011/04/06 11:39:42	1.63
--- src/include/unistd.h	2011/07/03 18:51:01	1.64
***************
*** 1,4 ****
! /*	$OpenBSD: unistd.h,v 1.63 2011/04/06 11:39:42 miod Exp $ */
  /*	$NetBSD: unistd.h,v 1.26.4.1 1996/05/28 02:31:51 mrg Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: unistd.h,v 1.64 2011/07/03 18:51:01 jsg Exp $ */
  /*	$NetBSD: unistd.h,v 1.26.4.1 1996/05/28 02:31:51 mrg Exp $	*/
  
  /*-
***************
*** 58,63 ****
--- 58,65 ----
  #ifndef NULL
  #ifdef 	__GNUG__
  #define	NULL	__null
+ #elif defined(__cplusplus)
+ #define	NULL	0L
  #else
  #define	NULL	((void *)0)
  #endif