diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/lib/libdevice/devctl.c | 10 | ||||
| -rw-r--r-- | usr/src/lib/libdevice/libdevice.h | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/usr/src/lib/libdevice/devctl.c b/usr/src/lib/libdevice/devctl.c index da48342..8bea9bc 100644 --- a/usr/src/lib/libdevice/devctl.c +++ b/usr/src/lib/libdevice/devctl.c @@ -37,7 +37,15 @@ #include <stdlib.h> #include <stdio.h> #include <unistd.h> -#include <sys/nvpair.h> + +#if defined(HAVE_LIBNVPAIR_H) +# include <libnvpair.h> +#elif defined(HAVE_SYS_NVPAIR_H) +# include <sys/nvpair.h> +#else +# error Cannot find libnvpair headers +#endif + #include "libdevice.h" static int _libdevice_debug = 0; diff --git a/usr/src/lib/libdevice/libdevice.h b/usr/src/lib/libdevice/libdevice.h index 22a8ab1..3bf4696 100644 --- a/usr/src/lib/libdevice/libdevice.h +++ b/usr/src/lib/libdevice/libdevice.h @@ -27,8 +27,6 @@ #ifndef _LIBDEVICE_H #define _LIBDEVICE_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/sunddi.h> #include <sys/ddi_impldefs.h> #include <sys/devctl.h> |