diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2017-09-19 22:42:02 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2017-09-19 22:42:02 -0500 |
| commit | 1fa4c88ee21866eeb0feae8f6b0bf609a04711cc (patch) | |
| tree | 99ddd7dc3d18f0fa1bf52220b1511d4e2a395032 /user/mac-fdisk/mac-fdisk-0.1_p16-proper-inline.patch | |
| parent | d9ac52b688c7adfc31c678a7cbc5a1e5c917fb6c (diff) | |
| download | packages-1fa4c88ee21866eeb0feae8f6b0bf609a04711cc.tar.gz packages-1fa4c88ee21866eeb0feae8f6b0bf609a04711cc.tar.bz2 packages-1fa4c88ee21866eeb0feae8f6b0bf609a04711cc.tar.xz packages-1fa4c88ee21866eeb0feae8f6b0bf609a04711cc.zip | |
user/mac-fdisk: new package
Diffstat (limited to 'user/mac-fdisk/mac-fdisk-0.1_p16-proper-inline.patch')
| -rw-r--r-- | user/mac-fdisk/mac-fdisk-0.1_p16-proper-inline.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/user/mac-fdisk/mac-fdisk-0.1_p16-proper-inline.patch b/user/mac-fdisk/mac-fdisk-0.1_p16-proper-inline.patch new file mode 100644 index 000000000..943827ffc --- /dev/null +++ b/user/mac-fdisk/mac-fdisk-0.1_p16-proper-inline.patch @@ -0,0 +1,65 @@ +diff --git a/fdisk.c b/fdisk.c
+index d77619b..540879a 100644
+--- a/fdisk.c
++++ b/fdisk.c
+@@ -192,13 +192,21 @@ char read_char(char *mesg);
+
+ jmp_buf listingbuf;
+
+-inline unsigned short __swap16(unsigned short x) {
++static inline unsigned short __swap16(unsigned short x) {
+ return (((__u16)(x) & 0xFF) << 8) | (((__u16)(x) & 0xFF00) >> 8);
+ }
+-inline __u32 __swap32(__u32 x) {
++static inline __u32 __swap32(__u32 x) {
+ return (((__u32)(x) & 0xFF) << 24) | (((__u32)(x) & 0xFF00) << 8) | (((__u32)(x) & 0xFF0000) >> 8) | (((__u32)(x) & 0xFF000000) >> 24);
+ }
+
++#if BYTE_ORDER == BIG_ENDIAN
++#define SWAP16(x) __swap16(x)
++#define SWAP32(x) __swap32(x)
++#else
++#define SWAP16(x) ((__u16)x)
++#define SWAP32(x) ((__u32)x)
++#endif
++
+ void fatal(enum failure why)
+ {
+ char error[LINE_LENGTH],
+@@ -1242,7 +1250,7 @@ void new_partition(void)
+ else
+ printf("Invalid partition number "
+ "for type `%c'\n", c);
+-
++
+ }
+ }
+
+@@ -1339,7 +1347,7 @@ void move_begin(int i)
+ }
+ first = rounded(calculate(p->head, p->sector, p->cyl), SWAP32(p->start_sect) +
+ offsets[i]);
+- new = read_int(first, first,
++ new = read_int(first, first,
+ SWAP32(p->start_sect) + SWAP32(p->nr_sects) + offsets[i] - 1,
+ lower, "New beginning of data") - offsets[i];
+
+diff --git a/fdisk.h b/fdisk.h
+index 2b6ddc8..9d3ab25 100644
+--- a/fdisk.h
++++ b/fdisk.h
+@@ -12,14 +12,6 @@ typedef long long ext2_loff_t;
+ typedef long ext2_loff_t;
+ #endif
+
+-#if BYTE_ORDER == BIG_ENDIAN
+-#define SWAP16(x) __swap16(x)
+-#define SWAP32(x) __swap32(x)
+-#else
+-#define SWAP16(x) ((__u16)x)
+-#define SWAP32(x) ((__u32)x)
+-#endif
+-
+ enum failure {usage, unable_to_open, unable_to_read, unable_to_seek,
+ unable_to_write, out_of_memory};
+
|