===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/include/unistd.h,v
retrieving revision 1.101
retrieving revision 1.102
diff -c -r1.101 -r1.102
*** src/include/unistd.h	2016/05/23 00:12:58	1.101
--- src/include/unistd.h	2016/09/09 18:12:37	1.102
***************
*** 1,4 ****
! /*	$OpenBSD: unistd.h,v 1.101 2016/05/23 00:12:58 guenther Exp $ */
  /*	$NetBSD: unistd.h,v 1.26.4.1 1996/05/28 02:31:51 mrg Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: unistd.h,v 1.102 2016/09/09 18:12:37 millert Exp $ */
  /*	$NetBSD: unistd.h,v 1.26.4.1 1996/05/28 02:31:51 mrg Exp $	*/
  
  /*-
***************
*** 35,40 ****
--- 35,41 ----
  #ifndef _UNISTD_H_
  #define	_UNISTD_H_
  
+ #include <sys/_null.h>
  #include <sys/types.h>
  #include <sys/unistd.h>
  
***************
*** 313,329 ****
  #define	_CS_POSIX_V7_THREADS_LDFLAGS		29
  #define	_CS_POSIX_V7_WIDTH_RESTRICTED_ENVS	30
  #define	_CS_V7_ENV				31
- 
- 
- #ifndef NULL
- #ifdef 	__GNUG__
- #define	NULL	__null
- #elif defined(__cplusplus)
- #define	NULL	0L
- #else
- #define	NULL	((void *)0)
- #endif
- #endif
  
  #ifndef	_INTPTR_T_DEFINED_
  #define	_INTPTR_T_DEFINED_
--- 314,319 ----