===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/include/locale.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/include/locale.h	2011/04/06 11:39:42	1.7
--- src/include/locale.h	2011/07/03 18:51:01	1.8
***************
*** 1,4 ****
! /*	$OpenBSD: locale.h,v 1.7 2011/04/06 11:39:42 miod Exp $	*/
  /*	$NetBSD: locale.h,v 1.6 1994/10/26 00:56:02 cgd Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: locale.h,v 1.8 2011/07/03 18:51:01 jsg Exp $	*/
  /*	$NetBSD: locale.h,v 1.6 1994/10/26 00:56:02 cgd Exp $	*/
  
  /*
***************
*** 59,64 ****
--- 59,66 ----
  #ifndef NULL
  #ifdef 	__GNUG__
  #define NULL	__null
+ #elif defined(__cplusplus)
+ #define	NULL	0L
  #else
  #define	NULL	((void *)0)
  #endif