diff options
| author | Brian Behlendorf <[email protected]> | 2009-03-11 11:00:42 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-03-11 11:00:42 -0700 |
| commit | 8fe801fd8f3bf538ec77b97c3ff0575d50d54e37 (patch) | |
| tree | 5fb20e8a231488cee077a6c4f7b90aef191d257b /module/zcommon | |
| parent | d641369d389f20fe3e49709512b567b0e1d5c601 (diff) | |
| parent | af450308507528775757f7031ca3645213fb52e4 (diff) | |
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
Diffstat (limited to 'module/zcommon')
| -rw-r--r-- | module/zcommon/include/sys/fm/fs/zfs.h | 2 | ||||
| -rw-r--r-- | module/zcommon/include/zfs_comutil.h | 2 | ||||
| -rw-r--r-- | module/zcommon/include/zfs_deleg.h | 2 | ||||
| -rw-r--r-- | module/zcommon/include/zfs_namecheck.h | 2 | ||||
| -rw-r--r-- | module/zcommon/include/zfs_prop.h | 2 | ||||
| -rw-r--r-- | module/zcommon/zfs_comutil.c | 2 | ||||
| -rw-r--r-- | module/zcommon/zfs_deleg.c | 2 | ||||
| -rw-r--r-- | module/zcommon/zfs_namecheck.c | 2 | ||||
| -rw-r--r-- | module/zcommon/zprop_common.c | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/module/zcommon/include/sys/fm/fs/zfs.h b/module/zcommon/include/sys/fm/fs/zfs.h index 66ca9c5d7..41b936a73 100644 --- a/module/zcommon/include/sys/fm/fs/zfs.h +++ b/module/zcommon/include/sys/fm/fs/zfs.h @@ -26,7 +26,7 @@ #ifndef _SYS_FM_FS_ZFS_H #define _SYS_FM_FS_ZFS_H -#pragma ident "%Z%%M% %I% %E% SMI" + #ifdef __cplusplus extern "C" { diff --git a/module/zcommon/include/zfs_comutil.h b/module/zcommon/include/zfs_comutil.h index f517044a8..b52e31e88 100644 --- a/module/zcommon/include/zfs_comutil.h +++ b/module/zcommon/include/zfs_comutil.h @@ -26,7 +26,7 @@ #ifndef _ZFS_COMUTIL_H #define _ZFS_COMUTIL_H -#pragma ident "%Z%%M% %I% %E% SMI" + #include <sys/fs/zfs.h> #include <sys/types.h> diff --git a/module/zcommon/include/zfs_deleg.h b/module/zcommon/include/zfs_deleg.h index 561b73e63..ae63584ad 100644 --- a/module/zcommon/include/zfs_deleg.h +++ b/module/zcommon/include/zfs_deleg.h @@ -26,7 +26,7 @@ #ifndef _ZFS_DELEG_H #define _ZFS_DELEG_H -#pragma ident "%Z%%M% %I% %E% SMI" + #include <sys/fs/zfs.h> diff --git a/module/zcommon/include/zfs_namecheck.h b/module/zcommon/include/zfs_namecheck.h index ec85e62f7..ab83cdf1d 100644 --- a/module/zcommon/include/zfs_namecheck.h +++ b/module/zcommon/include/zfs_namecheck.h @@ -26,7 +26,7 @@ #ifndef _ZFS_NAMECHECK_H #define _ZFS_NAMECHECK_H -#pragma ident "%Z%%M% %I% %E% SMI" + #ifdef __cplusplus extern "C" { diff --git a/module/zcommon/include/zfs_prop.h b/module/zcommon/include/zfs_prop.h index da5ae4309..bcc1b50c3 100644 --- a/module/zcommon/include/zfs_prop.h +++ b/module/zcommon/include/zfs_prop.h @@ -26,7 +26,7 @@ #ifndef _ZFS_PROP_H #define _ZFS_PROP_H -#pragma ident "%Z%%M% %I% %E% SMI" + #include <sys/fs/zfs.h> #include <sys/types.h> diff --git a/module/zcommon/zfs_comutil.c b/module/zcommon/zfs_comutil.c index 74517a3f6..2b9869f18 100644 --- a/module/zcommon/zfs_comutil.c +++ b/module/zcommon/zfs_comutil.c @@ -23,7 +23,7 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" + /* * This file is intended for functions that ought to be common between user diff --git a/module/zcommon/zfs_deleg.c b/module/zcommon/zfs_deleg.c index 1b94a2856..507842adc 100644 --- a/module/zcommon/zfs_deleg.c +++ b/module/zcommon/zfs_deleg.c @@ -24,7 +24,7 @@ */ -#pragma ident "%Z%%M% %I% %E% SMI" + #if defined(_KERNEL) #include <sys/systm.h> diff --git a/module/zcommon/zfs_namecheck.c b/module/zcommon/zfs_namecheck.c index a9d109be2..4926eac82 100644 --- a/module/zcommon/zfs_namecheck.c +++ b/module/zcommon/zfs_namecheck.c @@ -23,7 +23,7 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" + /* * Common name validation routines for ZFS. These routines are shared by the diff --git a/module/zcommon/zprop_common.c b/module/zcommon/zprop_common.c index a9f2ab315..48d58f302 100644 --- a/module/zcommon/zprop_common.c +++ b/module/zcommon/zprop_common.c @@ -23,7 +23,7 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" + /* * Common routines used by zfs and zpool property management. |