Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch

This commit is contained in:
Brian Behlendorf 2009-05-22 16:38:53 -07:00
parent 49b845f223 8aa0d4e52e
commit 3dc39b4640
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/zfs/zfs_main.c
View File

@ -1503,7 +1503,7 @@ zfs_do_upgrade(int argc, char **argv)
boolean_t showversions = B_FALSE; boolean_t showversions = B_FALSE;
int ret; int ret;
upgrade_cbdata_t cb = { 0 }; upgrade_cbdata_t cb = { 0 };
char c; signed char c;
int flags = ZFS_ITER_ARGS_CAN_BE_PATHS; int flags = ZFS_ITER_ARGS_CAN_BE_PATHS;
/* check options */ /* check options */
@ -2259,7 +2259,7 @@ zfs_do_snapshot(int argc, char **argv)
{ {
boolean_t recursive = B_FALSE; boolean_t recursive = B_FALSE;
int ret; int ret;
char c; signed char c;
nvlist_t *props; nvlist_t *props;
if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0) { if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0) {

6
lib/libspl/include/sys/isa_defs.h
View File

@ -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