Fixed dlls/ntdll/cdrom.c compilation in Darwin by adding HAVE_IOKit

detection to configure and defining SENSEBUFLEN as kSenseDefaultSize (which is corresponding IOKit enum value).

Fixed dlls/ntdll/cdrom.c compilation in Darwin by adding HAVE_IOKit
0f6c0394 · Phil Krylov · Alexandre Julliard · 31506e30 · 0f6c0394 · 0f6c0394
Commit 0f6c0394 authored Jul 01, 2005 by Phil Krylov Committed by Alexandre Julliard Jul 01, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 0 deletions

configure configure +2 -0

configure.ac configure.ac +1 -0

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

config.h.in include/config.h.in +3 -0

No files found.
--- a/configure
+++ b/configure
@@ -7110,7 +7110,9 @@ done



+
 for ac_header in \
+	IOKit/IOKitLib.h \
 	arpa/inet.h \
 	arpa/nameser.h \
 	asm/types.h \

--- a/configure.ac
+++ b/configure.ac
@@ -171,6 +171,7 @@ OPENGL_LIBS=""
 dnl **** Check for header files ****

 AC_CHECK_HEADERS(\
+	IOKit/IOKitLib.h \
 	arpa/inet.h \
 	arpa/nameser.h \
 	asm/types.h \

--- a/dlls/ntdll/cdrom.c
+++ b/dlls/ntdll/cdrom.c
@@ -75,6 +75,14 @@
 # include <sys/scsiio.h>
 #endif

+#ifdef HAVE_IOKIT_IOKITLIB_H
+# ifndef SENSEBUFLEN
+#  include <IOKit/IOKitLib.h>
+#  include <IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h>
+#  define SENSEBUFLEN kSenseDefaultSize
+# endif
+#endif
+
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 #include "ntstatus.h"

--- a/include/config.h.in
+++ b/include/config.h.in
@@ -224,6 +224,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H

+/* Define to 1 if you have the <IOKit/IOKitLib.h> header file. */
+#undef HAVE_IOKIT_IOKITLIB_H
+
 /* Define to 1 if you have the <io.h> header file. */
 #undef HAVE_IO_H