5005 libnvpair JSON output broken by lint fixes
5006 libnvpair JSON cannot print int16 arrays
Reviewed by: Robert Mustacchi <rm@joyent.com>

*** 21,31 ****
  #
  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  # Copyright (c) 2012 by Delphix. All rights reserved.
! # Copyright (c) 2013, Joyent, Inc. All rights reserved.
  #
  
  LIBRARY=        libnvpair.a
  VERS=           .1
  
--- 21,31 ----
  #
  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
  # Copyright (c) 2012 by Delphix. All rights reserved.
! # Copyright (c) 2014, Joyent, Inc. All rights reserved.
  #
  
  LIBRARY=        libnvpair.a
  VERS=           .1
  
*** 58,71 ****
--- 58,73 ----
  # turn off warning caused by lint bug: not understanding SCNi8 "hhi"
  LINTFLAGS +=    -erroff=E_BAD_FORMAT_STR2
  LINTFLAGS +=    -erroff=E_INVALID_TOKEN_IN_DEFINE_MACRO
  LINTFLAGS +=    -erroff=E_RET_INT_IMPLICITLY
  LINTFLAGS +=    -erroff=E_FUNC_USED_VAR_ARG2
+ LINTFLAGS +=    -erroff=E_CONSTANT_CONDITION
  LINTFLAGS64 +=  -erroff=E_BAD_FORMAT_STR2
  LINTFLAGS64 +=  -erroff=E_INVALID_TOKEN_IN_DEFINE_MACRO
  LINTFLAGS64 +=  -erroff=E_RET_INT_IMPLICITLY
  LINTFLAGS64 +=  -erroff=E_FUNC_USED_VAR_ARG2
+ LINTFLAGS64 +=  -erroff=E_CONSTANT_CONDITION
  
  CERRWARN +=     -_gcc=-Wno-type-limits
  CERRWARN +=     -_gcc=-Wno-parentheses
  CERRWARN +=     -_gcc=-Wno-uninitialized