5218 posix definition of NULL
correct unistd.h and iso/stddef_iso.h
update gate source affected

          --- old/usr/src/head/iso/stddef_iso.h
          +++ new/usr/src/head/iso/stddef_iso.h

   1    1  /*
   2    2   * CDDL HEADER START
   3    3   *
   4    4   * The contents of this file are subject to the terms of the
   5    5   * Common Development and Distribution License, Version 1.0 only
   6    6   * (the "License").  You may not use this file except in compliance
   7    7   * with the License.
   8    8   *
   9    9   * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  10   10   * or http://www.opensolaris.org/os/licensing.
  11   11   * See the License for the specific language governing permissions
  12   12   * and limitations under the License.
  13   13   *
  14   14   * When distributing Covered Code, include this CDDL HEADER in each
  15   15   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  16   16   * If applicable, add the following below this CDDL HEADER, with the
  17   17   * fields enclosed by brackets "[]" replaced with your own identifying
  18   18   * information: Portions Copyright [yyyy] [name of copyright owner]
  19   19   *
  20   20   * CDDL HEADER END
  21   21   */

  22   22  /*      Copyright (c) 1988 AT&T */
  23   23  /*        All Rights Reserved   */
  24   24  
  25   25  
  26   26  /*
  27   27   * Copyright 1999-2003 Sun Microsystems, Inc.  All rights reserved.
  28   28   * Use is subject to license terms.
  29   29   */
  30   30  
  31   31  /*
       32 + * Copyright 2014 PALO, Richard.
       33 + */
       34 +
       35 +/*
  32   36   * An application should not include this header directly.  Instead it
  33   37   * should be included only through the inclusion of other Sun headers.
  34   38   *
  35   39   * The contents of this header is limited to identifiers specified in the
  36   40   * C Standard.  Any new identifiers specified in future amendments to the
  37   41   * C Standard must be placed in this header.  If these new identifiers
  38   42   * are required to also be in the C++ Standard "std" namespace, then for
  39   43   * anything other than macro definitions, corresponding "using" directives
  40   44   * must also be added to <stddef.h.h>.
  41   45   */
  42   46  
  43   47  #ifndef _ISO_STDDEF_ISO_H
  44   48  #define _ISO_STDDEF_ISO_H
  45   49  
  46      -#pragma ident   "%Z%%M% %I%     %E% SMI" /* SVr4.0 1.5 */
  47      -
  48   50  #include <sys/isa_defs.h>
       51 +#include <sys/null.h>
  49   52  
  50   53  #ifdef  __cplusplus
  51   54  extern "C" {
  52   55  #endif
  53   56  
  54   57  #if __cplusplus >= 199711L
  55   58  namespace std {
  56   59  #endif
  57   60  
  58      -#ifndef NULL
  59      -#if defined(_LP64)
  60      -#define NULL    0L
  61      -#else
  62      -#define NULL    0
  63      -#endif
  64      -#endif
  65      -
  66   61  #if !defined(_PTRDIFF_T) || __cplusplus >= 199711L
  67   62  #define _PTRDIFF_T
  68   63  #if defined(_LP64) || defined(_I32LPx)
  69   64  typedef long    ptrdiff_t;              /* pointer difference */
  70   65  #else
  71   66  typedef int     ptrdiff_t;              /* (historical version) */
  72   67  #endif
  73   68  #endif  /* !_PTRDIFF_T */
  74   69  
  75   70  #if !defined(_SIZE_T) || __cplusplus >= 199711L

  76   71  #define _SIZE_T
  77   72  #if defined(_LP64) || defined(_I32LPx)
  78   73  typedef unsigned long   size_t;         /* size of something in bytes */
  79   74  #else
  80   75  typedef unsigned int    size_t;         /* (historical version) */
  81   76  #endif
  82   77  #endif  /* !_SIZE_T */
  83   78  
  84   79  #if __cplusplus >= 199711L
  85   80  }
  86   81  #endif /* end of namespace std */
  87   82  
  88   83  #if __cplusplus >= 199711L
  89   84  #define offsetof(s, m)  (std::size_t)(&(((s *)0)->m))
  90   85  #else
  91   86  #define offsetof(s, m)  (size_t)(&(((s *)0)->m))
  92   87  #endif
  93   88  
  94   89  #ifdef  __cplusplus
  95   90  }
  96   91  #endif
  97   92  
  98   93  #endif  /* _ISO_STDDEF_ISO_H */

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX