From 0f6c0394bf45479429c9fcda9921a4c82a875c0a Mon Sep 17 00:00:00 2001 From: Phil Krylov Date: Fri, 1 Jul 2005 19:15:26 +0000 Subject: [PATCH] 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). --- configure | 2 ++ configure.ac | 1 + dlls/ntdll/cdrom.c | 8 ++++++++ include/config.h.in | 3 +++ 4 files changed, 14 insertions(+) diff --git a/configure b/configure index 87fce3848cc..160cd2cefab 100755 --- a/configure +++ b/configure @@ -7108,9 +7108,11 @@ done + for ac_header in \ + IOKit/IOKitLib.h \ arpa/inet.h \ arpa/nameser.h \ asm/types.h \ diff --git a/configure.ac b/configure.ac index 175eadd505d..93d0fbdff38 100644 --- 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 \ diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 67e794345e7..67f006b611c 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -75,6 +75,14 @@ # include #endif +#ifdef HAVE_IOKIT_IOKITLIB_H +# ifndef SENSEBUFLEN +# include +# include +# define SENSEBUFLEN kSenseDefaultSize +# endif +#endif + #define NONAMELESSUNION #define NONAMELESSSTRUCT #include "ntstatus.h" diff --git a/include/config.h.in b/include/config.h.in index 53fd7bb6f88..7b9ce7049a1 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -224,6 +224,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H +/* Define to 1 if you have the header file. */ +#undef HAVE_IOKIT_IOKITLIB_H + /* Define to 1 if you have the header file. */ #undef HAVE_IO_H