diff options
author | Rob Landley <rob@landley.net> | 2006-08-29 19:41:06 +0000 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2006-08-29 19:41:06 +0000 |
commit | 88621d73980a3cb53c1f35e64a06d7cd64188987 (patch) | |
tree | c0398d52bf44783d2dc330b4b33a908a58d2d55b /util-linux/fdisk.c | |
parent | 8c1eda528a19b8af18568649e8d2b1ba5bda772e (diff) | |
download | busybox-w32-88621d73980a3cb53c1f35e64a06d7cd64188987.tar.gz busybox-w32-88621d73980a3cb53c1f35e64a06d7cd64188987.tar.bz2 busybox-w32-88621d73980a3cb53c1f35e64a06d7cd64188987.zip |
Svn 16007 broke the build under gcc 4.0.3. This fixes up some of the damage
(the e2fsprogs directory is too twisty and evil to easily fix, but I plan
to rewrite it anyway so I'll just bump that up in priority a bit).
Diffstat (limited to 'util-linux/fdisk.c')
-rw-r--r-- | util-linux/fdisk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index 310bd555e..8c7225816 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c | |||
@@ -1631,13 +1631,13 @@ alpha_bootblock_checksum(char *boot) | |||
1631 | #endif /* OSF_LABEL */ | 1631 | #endif /* OSF_LABEL */ |
1632 | 1632 | ||
1633 | #if defined(CONFIG_FEATURE_SGI_LABEL) || defined(CONFIG_FEATURE_SUN_LABEL) | 1633 | #if defined(CONFIG_FEATURE_SGI_LABEL) || defined(CONFIG_FEATURE_SUN_LABEL) |
1634 | static inline unsigned short | 1634 | static unsigned short |
1635 | __swap16(unsigned short x) | 1635 | __swap16(unsigned short x) |
1636 | { | 1636 | { |
1637 | return (((uint16_t)(x) & 0xFF) << 8) | (((uint16_t)(x) & 0xFF00) >> 8); | 1637 | return (((uint16_t)(x) & 0xFF) << 8) | (((uint16_t)(x) & 0xFF00) >> 8); |
1638 | } | 1638 | } |
1639 | 1639 | ||
1640 | static inline uint32_t | 1640 | static uint32_t |
1641 | __swap32(uint32_t x) | 1641 | __swap32(uint32_t x) |
1642 | { | 1642 | { |
1643 | return (((x & 0xFF) << 24) | | 1643 | return (((x & 0xFF) << 24) | |
@@ -3919,7 +3919,7 @@ get_sectorsize(void) | |||
3919 | } | 3919 | } |
3920 | } | 3920 | } |
3921 | 3921 | ||
3922 | static inline void | 3922 | static void |
3923 | get_kernel_geometry(void) | 3923 | get_kernel_geometry(void) |
3924 | { | 3924 | { |
3925 | struct hd_geometry geometry; | 3925 | struct hd_geometry geometry; |