From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33554) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROZY1-0004Vh-Mu for qemu-devel@nongnu.org; Thu, 10 Nov 2011 13:40:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ROZY0-0007Lc-98 for qemu-devel@nongnu.org; Thu, 10 Nov 2011 13:40:25 -0500 Received: from mail-bw0-f45.google.com ([209.85.214.45]:47584) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ROZY0-0007KN-29 for qemu-devel@nongnu.org; Thu, 10 Nov 2011 13:40:24 -0500 Received: by mail-bw0-f45.google.com with SMTP id zu5so2995701bkb.4 for ; Thu, 10 Nov 2011 10:40:23 -0800 (PST) From: Pavel Borzenkov Date: Thu, 10 Nov 2011 22:40:06 +0400 Message-Id: <1320950407-43512-3-git-send-email-pavel.borzenkov@gmail.com> In-Reply-To: <1320950407-43512-1-git-send-email-pavel.borzenkov@gmail.com> References: <1320950407-43512-1-git-send-email-pavel.borzenkov@gmail.com> Subject: [Qemu-devel] [PATCH 2/3] raw-posix: Do not use CONFIG_COCOA macro List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: andreas.faerber@web.de Use __APPLE__ and __MACH__ macros instead of CONFIG_COCOA to detect Mac OS X host. The patch is based on the Ben Leslie's patch: http://patchwork.ozlabs.org/patch/97859/ Signed-off-by: Pavel Borzenkov --- 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 17e1c6f..ee08f80 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 #include #include @@ -487,7 +487,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); @@ -632,7 +632,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 ); @@ -710,7 +710,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; -- 1.7.5.4