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

2bbb39d6 · Eric Pouech · Alexandre Julliard · aa3ad44e · 2bbb39d6
Commit 2bbb39d6 authored Mar 04, 2008 by Eric Pouech Committed by Alexandre Julliard Mar 05, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

cdrom.c dlls/ntdll/cdrom.c +1 -0

No files found.
--- 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>