diff options
| author | Pavel Borzenkov <pavel.borzenkov@gmail.com> | 2011-11-10 22:40:06 +0400 |
|---|---|---|
| committer | Andreas Färber <andreas.faerber@web.de> | 2012-05-01 00:16:58 +0200 |
| commit | 83affaa622a938e0a12a1f7079f00c7a3333d72a (patch) | |
| tree | 5a6879bb1465aebcb1dee56a469c263cee4e0f2a /block | |
| parent | 42fe1c245f0239ebcdc084740a1777ac3699d071 (diff) | |
| download | qemu-83affaa622a938e0a12a1f7079f00c7a3333d72a.zip | |
raw-posix: Do not use CONFIG_COCOA macro
Use __APPLE__ and __MACH__ macros instead of CONFIG_COCOA to detect Mac
OS X host. The patch is based on Ben Leslie's patch:
http://patchwork.ozlabs.org/patch/97859/
Signed-off-by: Ben Leslie <benno@benno.id.au>
Signed-off-by: Pavel Borzenkov <pavel.borzenkov@gmail.com>
Acked-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Diffstat (limited to 'block')
| -rw-r--r-- | block/raw-posix.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/block/raw-posix.c b/block/raw-posix.c index 2d1bc13484..03fcfcc031 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -29,7 +29,7 @@ #include "module.h" #include "block/raw-posix-aio.h" -#ifdef CONFIG_COCOA +#if defined(__APPLE__) && (__MACH__) #include <paths.h> #include <sys/param.h> #include <IOKit/IOKitLib.h> @@ -505,7 +505,7 @@ again: } if (size == 0) #endif -#ifdef CONFIG_COCOA +#if defined(__APPLE__) && defined(__MACH__) size = LONG_LONG_MAX; #else size = lseek(fd, 0LL, SEEK_END); @@ -650,7 +650,7 @@ static BlockDriver bdrv_file = { /***********************************************/ /* host device */ -#ifdef CONFIG_COCOA +#if defined(__APPLE__) && defined(__MACH__) static kern_return_t FindEjectableCDMedia( io_iterator_t *mediaIterator ); static kern_return_t GetBSDPath( io_iterator_t mediaIterator, char *bsdPath, CFIndex maxPathSize ); @@ -728,7 +728,7 @@ static int hdev_open(BlockDriverState *bs, const char *filename, int flags) { BDRVRawState *s = bs->opaque; -#ifdef CONFIG_COCOA +#if defined(__APPLE__) && defined(__MACH__) if (strstart(filename, "/dev/cdrom", NULL)) { kern_return_t kernResult; io_iterator_t mediaIterator; |