From 2bbb39d6017f0ea589e9b5eeabed039a1dd9777e Mon Sep 17 00:00:00 2001 From: Eric Pouech Date: Tue, 4 Mar 2008 21:36:54 +0100 Subject: [PATCH] ntdll: Removed conflict for FAILED (defined both in our winerror.h and in linux/scsi.h). --- dlls/ntdll/cdrom.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 9da442c3976..e53e41d8aa5 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -49,6 +49,7 @@ #ifdef HAVE_SCSI_SCSI_H # include # undef REASSIGN_BLOCKS /* avoid conflict with winioctl.h */ +# undef FAILED /* avoid conflict with winerror.h */ #endif #ifdef HAVE_SCSI_SCSI_IOCTL_H # include