OS-1840 fmdump shall emit JSON (copyright fixes 2)
OS-1840 fmdump shall emit JSON (rm feedback)

*** 19,28 ****
--- 19,29 ----
   * CDDL HEADER END
   */
  /*
   * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2012 by Delphix. All rights reserved.
+  * Copyright (c) 2013, Joyent, Inc. All rights reserved.
   */
  
  #ifndef _SYS_NVPAIR_H
  #define _SYS_NVPAIR_H
  
*** 321,331 ****
  uchar_t fnvlist_lookup_byte(nvlist_t *nvl, const char *name);
  int8_t fnvlist_lookup_int8(nvlist_t *nvl, const char *name);
  int16_t fnvlist_lookup_int16(nvlist_t *nvl, const char *name);
  int32_t fnvlist_lookup_int32(nvlist_t *nvl, const char *name);
  int64_t fnvlist_lookup_int64(nvlist_t *nvl, const char *name);
! uint8_t fnvlist_lookup_uint8_t(nvlist_t *nvl, const char *name);
  uint16_t fnvlist_lookup_uint16(nvlist_t *nvl, const char *name);
  uint32_t fnvlist_lookup_uint32(nvlist_t *nvl, const char *name);
  uint64_t fnvlist_lookup_uint64(nvlist_t *nvl, const char *name);
  char *fnvlist_lookup_string(nvlist_t *nvl, const char *name);
  nvlist_t *fnvlist_lookup_nvlist(nvlist_t *nvl, const char *name);
--- 322,332 ----
  uchar_t fnvlist_lookup_byte(nvlist_t *nvl, const char *name);
  int8_t fnvlist_lookup_int8(nvlist_t *nvl, const char *name);
  int16_t fnvlist_lookup_int16(nvlist_t *nvl, const char *name);
  int32_t fnvlist_lookup_int32(nvlist_t *nvl, const char *name);
  int64_t fnvlist_lookup_int64(nvlist_t *nvl, const char *name);
! uint8_t fnvlist_lookup_uint8(nvlist_t *nvl, const char *name);
  uint16_t fnvlist_lookup_uint16(nvlist_t *nvl, const char *name);
  uint32_t fnvlist_lookup_uint32(nvlist_t *nvl, const char *name);
  uint64_t fnvlist_lookup_uint64(nvlist_t *nvl, const char *name);
  char *fnvlist_lookup_string(nvlist_t *nvl, const char *name);
  nvlist_t *fnvlist_lookup_nvlist(nvlist_t *nvl, const char *name);
*** 334,349 ****
  uchar_t fnvpair_value_byte(nvpair_t *nvp);
  int8_t fnvpair_value_int8(nvpair_t *nvp);
  int16_t fnvpair_value_int16(nvpair_t *nvp);
  int32_t fnvpair_value_int32(nvpair_t *nvp);
  int64_t fnvpair_value_int64(nvpair_t *nvp);
! uint8_t fnvpair_value_uint8_t(nvpair_t *nvp);
  uint16_t fnvpair_value_uint16(nvpair_t *nvp);
  uint32_t fnvpair_value_uint32(nvpair_t *nvp);
  uint64_t fnvpair_value_uint64(nvpair_t *nvp);
  char *fnvpair_value_string(nvpair_t *nvp);
  nvlist_t *fnvpair_value_nvlist(nvpair_t *nvp);
  
  #ifdef  __cplusplus
  }
  #endif
  
--- 335,354 ----
  uchar_t fnvpair_value_byte(nvpair_t *nvp);
  int8_t fnvpair_value_int8(nvpair_t *nvp);
  int16_t fnvpair_value_int16(nvpair_t *nvp);
  int32_t fnvpair_value_int32(nvpair_t *nvp);
  int64_t fnvpair_value_int64(nvpair_t *nvp);
! uint8_t fnvpair_value_uint8(nvpair_t *nvp);
  uint16_t fnvpair_value_uint16(nvpair_t *nvp);
  uint32_t fnvpair_value_uint32(nvpair_t *nvp);
  uint64_t fnvpair_value_uint64(nvpair_t *nvp);
  char *fnvpair_value_string(nvpair_t *nvp);
  nvlist_t *fnvpair_value_nvlist(nvpair_t *nvp);
+ hrtime_t fnvpair_value_hrtime(nvpair_t *);
+ #if !defined(_KERNEL)
+ double fnvpair_value_double(nvpair_t *);
+ #endif
  
  #ifdef  __cplusplus
  }
  #endif