Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
This commit is contained in:
commit
bf426953af
|
@ -69,7 +69,7 @@ extern "C" {
|
||||||
|
|
||||||
#define _SUNOS_VTOC_16
|
#define _SUNOS_VTOC_16
|
||||||
|
|
||||||
/* powerpc (ppc64) arch specific defines */
|
/* powerpc arch specific defines */
|
||||||
#elif defined(__powerpc) || defined(__powerpc__)
|
#elif defined(__powerpc) || defined(__powerpc__)
|
||||||
|
|
||||||
#if !defined(__powerpc)
|
#if !defined(__powerpc)
|
||||||
|
@ -81,7 +81,11 @@ extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(_LP64)
|
#if !defined(_LP64)
|
||||||
|
#ifdef __powerpc64__
|
||||||
#define _LP64
|
#define _LP64
|
||||||
|
#else
|
||||||
|
#define _LP32
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define _SUNOS_VTOC_16
|
#define _SUNOS_VTOC_16
|
||||||
|
|
Loading…
Reference in New Issue