[PATCH] [NtDll]: removed conflict for FAILED (defined both in our winerror.h and in linux/scsi.h)
Eric Pouech
eric.pouech at orange.fr
Tue Mar 4 14:36:54 CST 2008
A+
---
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>
More information about the wine-patches
mailing list