diff options
author | Dave Chapman <dave@dchapman.com> | 2006-12-15 00:09:48 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2006-12-15 00:09:48 +0000 |
commit | 49e016c48fe58ee50cd2f1dbb95bad420dd6c50e (patch) | |
tree | c08c40d0783b6c9d9a6c1a2e984f499aa2641824 | |
parent | e21e87a2d0f1d915be0793f4ba34483ae4fd2231 (diff) | |
download | rockbox-49e016c48fe58ee50cd2f1dbb95bad420dd6c50e.tar.gz rockbox-49e016c48fe58ee50cd2f1dbb95bad420dd6c50e.zip |
Reorganise the ioctl() #ifdefs - this should fix ipodpatcher for BSD
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11768 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | tools/ipodpatcher/ipodio-posix.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tools/ipodpatcher/ipodio-posix.c b/tools/ipodpatcher/ipodio-posix.c index 4b55d62629..7035bf2322 100644 --- a/tools/ipodpatcher/ipodio-posix.c +++ b/tools/ipodpatcher/ipodio-posix.c @@ -25,18 +25,17 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/ioctl.h> -#include <sys/mount.h> -#if defined(__APPLE__) && defined(__MACH__) -#include <sys/disk.h> -#endif #if defined(linux) || defined (__linux) - #define IPOD_SECTORSIZE_IOCTL BLKSSZGET +#include <sys/mount.h> +#define IPOD_SECTORSIZE_IOCTL BLKSSZGET #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) \ || defined(__bsdi__) || defined(__DragonFly__) - #define IPOD_SECTORSIZE_IOCTL DIOCGSECTORSIZE +#include <sys/disk.h> +#define IPOD_SECTORSIZE_IOCTL DIOCGSECTORSIZE #elif defined(__APPLE__) && defined(__MACH__) - #define IPOD_SECTORSIZE_IOCTL DKIOCGETBLOCKSIZE +#include <sys/disk.h> +#define IPOD_SECTORSIZE_IOCTL DKIOCGETBLOCKSIZE #else #error No sector-size detection implemented for this platform #endif |