projects
/
rrq
/
maintain_lilo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'upstream/24.2'
[rrq/maintain_lilo.git]
/
src
/
geometry.c
diff --git
a/src/geometry.c
b/src/geometry.c
index f033f839de63ed1c08d5693cae4cbd79cdb5e2a9..196a8924d995a4e691c12caa6e7e5322a9863e1f 100644
(file)
--- a/
src/geometry.c
+++ b/
src/geometry.c
@@
-2,7
+2,7
@@
*
* Copyright 1992-1998 Werner Almesberger
* Copyright 1999-2005 John Coffman
*
* Copyright 1992-1998 Werner Almesberger
* Copyright 1999-2005 John Coffman
- * Copyright 2009-201
4
Joachim Wiedorn
+ * Copyright 2009-201
5
Joachim Wiedorn
* All rights reserved.
*
* Licensed under the terms contained in the file 'COPYING'
* All rights reserved.
*
* Licensed under the terms contained in the file 'COPYING'
@@
-55,7
+55,7
@@
#endif
#ifndef REISERFS_IOC_UNPACK
#endif
#ifndef REISERFS_IOC_UNPACK
-#define REISERFS_IOC_UNPACK _IOW(0xCD,1,
long
)
+#define REISERFS_IOC_UNPACK _IOW(0xCD,1,
int32_t
)
#endif
#ifndef REISER4_SUPER_MAGIC
#endif
#ifndef REISER4_SUPER_MAGIC
@@
-63,7
+63,7
@@
/* (*(__u32 *)"R4Sb"); */
#endif
#ifndef REISER4_IOC_UNPACK
/* (*(__u32 *)"R4Sb"); */
#endif
#ifndef REISER4_IOC_UNPACK
-#define REISER4_IOC_UNPACK _IOW(0xCD,1,
long
)
+#define REISER4_IOC_UNPACK _IOW(0xCD,1,
int32_t
)
#endif
#endif
#endif
#endif
@@
-1268,7
+1268,7
@@
int pass;
for (walk = disktab; walk; walk = walk->next)
if (walk->device == (device & D_MASK(device))) break;
#if BETA_TEST
for (walk = disktab; walk; walk = walk->next)
if (walk->device == (device & D_MASK(device))) break;
#if BETA_TEST
- if (verbose>=5) printf("walk=%0
8lx\n", (long
)walk);
+ if (verbose>=5) printf("walk=%0
*" PRIxPTR "\n", PTR_WIDTH, (intptr_t
)walk);
#endif
#if 1
#endif
#if 1