Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2008-12-17 12:48:15 -08:00
commit 52d8216e19
1 changed files with 4 additions and 1 deletions

View File

@ -114,9 +114,12 @@ extern "C" {
/* /*
* Convert mode bits (zp_mode) to BSD-style DT_* values for storing in * Convert mode bits (zp_mode) to BSD-style DT_* values for storing in
* the directory entries. * the directory entries. On Linux systems this value is already
* defined correctly as part of the /usr/include/dirent.h header file.
*/ */
#ifndef IFTODT
#define IFTODT(mode) (((mode) & S_IFMT) >> 12) #define IFTODT(mode) (((mode) & S_IFMT) >> 12)
#endif
/* /*
* The directory entry has the type (currently unused on Solaris) in the * The directory entry has the type (currently unused on Solaris) in the