Print this page
3373 gcc >= 4.5 concerns about offsetof()

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/avs/ns/sv/sv.c
          +++ new/usr/src/uts/common/avs/ns/sv/sv.c
↓ open down ↓ 2409 lines elided ↑ open up ↑
2410 2410  
2411 2411                          sv_max_nlive = nlive;
2412 2412                  }
2413 2413          }
2414 2414  
2415 2415          return (0);
2416 2416  }
2417 2417  
2418 2418  
2419 2419  #ifndef offsetof
2420      -#define offsetof(s, m)  ((size_t)(&((s *)0)->m))
     2420 +#if defined(__GNUC__)
     2421 +#define offsetof(s, m)  __builtin_offsetof(s, m)
     2422 +#else
     2423 +#define offsetof(s, m)  ((size_t)(&(((s *)0)->m)))
     2424 +#endif
2421 2425  #endif
2422 2426  
2423 2427  /*
2424 2428   * re-write the size of the current partition
2425 2429   */
2426 2430  static int
2427 2431  sv_fix_dkiocgvtoc(const intptr_t arg, const int mode, sv_dev_t *svp)
2428 2432  {
2429 2433          size_t offset;
2430 2434          int ilp32;
↓ open down ↓ 390 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX