Print this page
2976 remove useless offsetof() macros

Split Close
Expand all
Collapse all
          --- old/usr/src/common/nvpair/nvpair.c
          +++ new/usr/src/common/nvpair/nvpair.c
↓ open down ↓ 28 lines elided ↑ open up ↑
  29   29  #include <sys/int_limits.h>
  30   30  #include <sys/nvpair.h>
  31   31  #include <sys/nvpair_impl.h>
  32   32  #include <rpc/types.h>
  33   33  #include <rpc/xdr.h>
  34   34  
  35   35  #if defined(_KERNEL) && !defined(_BOOT)
  36   36  #include <sys/varargs.h>
  37   37  #include <sys/ddi.h>
  38   38  #include <sys/sunddi.h>
       39 +#include <sys/sysmacros.h>
  39   40  #else
  40   41  #include <stdarg.h>
  41   42  #include <stdlib.h>
  42   43  #include <string.h>
  43   44  #include <strings.h>
       45 +#include <stddef.h>
  44   46  #endif
  45   47  
  46      -#ifndef offsetof
  47      -#define offsetof(s, m)          ((size_t)(&(((s *)0)->m)))
  48      -#endif
  49   48  #define skip_whitespace(p)      while ((*(p) == ' ') || (*(p) == '\t')) p++
  50   49  
  51   50  /*
  52   51   * nvpair.c - Provides kernel & userland interfaces for manipulating
  53   52   *      name-value pairs.
  54   53   *
  55   54   * Overview Diagram
  56   55   *
  57   56   *  +--------------+
  58   57   *  |  nvlist_t    |
↓ open down ↓ 3242 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX