Eric Pouech : ntdll: Removed conflict for FAILED ( defined both in our winerror.h and in linux/scsi.h).

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2bbb39d6017f0ea589e9b5eeabed039a1dd9777e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2bbb39d6017f0ea589e9b5eeab...

Author: Eric Pouech <eric.pouech(a)orange.fr>
Date:   Tue Mar  4 21:36:54 2008 +0100

ntdll: Removed conflict for FAILED (defined both in our winerror.h and in linux/scsi.h).

---

 dlls/ntdll/cdrom.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c
index 9da442c..e53e41d 100644
--- a/dlls/ntdll/cdrom.c
+++ b/dlls/ntdll/cdrom.c
@@ -49,6 +49,7 @@
 #ifdef HAVE_SCSI_SCSI_H
 # include <scsi/scsi.h>
 # undef REASSIGN_BLOCKS  /* avoid conflict with winioctl.h */
+# undef FAILED           /* avoid conflict with winerror.h */
 #endif
 #ifdef HAVE_SCSI_SCSI_IOCTL_H
 # include <scsi/scsi_ioctl.h>