3373 gcc >= 4.5 concerns about offsetof()

          --- old/usr/src/cmd/mdb/common/modules/libumem/misc.h
          +++ new/usr/src/cmd/mdb/common/modules/libumem/misc.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 (the "License").
   6    6   * You may not use this file except in compliance with the License.
   7    7   *
   8    8   * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9   * or http://www.opensolaris.org/os/licensing.
  10   10   * See the License for the specific language governing permissions
  11   11   * and limitations under the License.
  12   12   *
  13   13   * When distributing Covered Code, include this CDDL HEADER in each
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *

  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  23   23   * Use is subject to license terms.
  24   24   */
  25   25  
  26   26  #ifndef _MDBMOD_MISC_H
  27   27  #define _MDBMOD_MISC_H
  28   28  
  29      -#pragma ident   "%Z%%M% %I%     %E% SMI"
  30      -
  31   29  #include <mdb/mdb_modapi.h>
  32   30  
  33   31  #ifdef __cplusplus
  34   32  extern "C" {
  35   33  #endif
  36   34  
       35 +#if defined(__GNUC__)
       36 +#define offsetof(s, m)  __builtin_offsetof(s, m)
       37 +#else
  37   38  #define offsetof(s, m)  ((size_t)(&(((s *)0)->m)))
       39 +#endif
  38   40  
  39   41  extern int umem_debug(uintptr_t, uint_t, int, const mdb_arg_t *);
  40   42  
  41   43  extern int umem_set_standalone(void);
  42   44  extern ssize_t umem_lookup_by_name(const char *, GElf_Sym *);
  43   45  extern ssize_t umem_readvar(void *, const char *);
  44   46  
  45   47  /*
  46   48   * Returns non-zero if sym matches libumem*`prefix*
  47   49   */

  48   50  int is_umem_sym(const char *, const char *);
  49   51  
  50   52  #define dprintf(x) if (umem_debug_level) { \
  51   53          mdb_printf("umem debug: ");  \
  52   54          /*CSTYLED*/\
  53   55          mdb_printf x ;\
  54   56  }
  55   57  
  56   58  #define dprintf_cont(x) if (umem_debug_level) { \
  57   59          /*CSTYLED*/\
  58   60          mdb_printf x ;\
  59   61  }
  60   62  
  61   63  extern int umem_debug_level;
  62   64  
  63   65  #ifdef __cplusplus
  64   66  }
  65   67  #endif
  66   68  
  67   69  #endif  /* _MDBMOD_MISC_H */

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX