diff options
| author | Brian Behlendorf <[email protected]> | 2009-03-11 11:00:45 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-03-11 11:00:45 -0700 |
| commit | 57b10339b331781d08fc47fa612146a8e607753d (patch) | |
| tree | 901c40fd6f5d4755d835f93ea16e9420501bb35e /module/nvpair | |
| parent | faa3499f83896a41b0ca88e741a22690ab71931e (diff) | |
| parent | 8fe801fd8f3bf538ec77b97c3ff0575d50d54e37 (diff) | |
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
Diffstat (limited to 'module/nvpair')
| -rw-r--r-- | module/nvpair/include/sys/nvpair.h | 2 | ||||
| -rw-r--r-- | module/nvpair/include/sys/nvpair_impl.h | 2 | ||||
| -rw-r--r-- | module/nvpair/nvpair.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/module/nvpair/include/sys/nvpair.h b/module/nvpair/include/sys/nvpair.h index 9e768541f..14a45956f 100644 --- a/module/nvpair/include/sys/nvpair.h +++ b/module/nvpair/include/sys/nvpair.h @@ -26,7 +26,7 @@ #ifndef _SYS_NVPAIR_H #define _SYS_NVPAIR_H -#pragma ident "%Z%%M% %I% %E% SMI" + #include <sys/types.h> #include <sys/errno.h> diff --git a/module/nvpair/include/sys/nvpair_impl.h b/module/nvpair/include/sys/nvpair_impl.h index f12dbbfe6..b851ddd54 100644 --- a/module/nvpair/include/sys/nvpair_impl.h +++ b/module/nvpair/include/sys/nvpair_impl.h @@ -27,7 +27,7 @@ #ifndef _NVPAIR_IMPL_H #define _NVPAIR_IMPL_H -#pragma ident "%Z%%M% %I% %E% SMI" + #ifdef __cplusplus extern "C" { diff --git a/module/nvpair/nvpair.c b/module/nvpair/nvpair.c index 81f22deee..7638d8cad 100644 --- a/module/nvpair/nvpair.c +++ b/module/nvpair/nvpair.c @@ -24,7 +24,7 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" + #include <sys/stropts.h> #include <sys/debug.h> |