From cbad176bd836ff5da40605af0a76bb955ac5cb4f Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Sun, 28 Jun 2009 23:16:41 +0000 Subject: [PATCH] - Remove alternative definition of KSDATAFORMAT which was introduced in 41468 and also exists in MS header - Fixes breakage of AC97 in real hw - MS should start fixing their headers svn path=/trunk/; revision=41677 --- reactos/include/psdk/ks.h | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/reactos/include/psdk/ks.h b/reactos/include/psdk/ks.h index d8b80a55c0a..24fba94018a 100644 --- a/reactos/include/psdk/ks.h +++ b/reactos/include/psdk/ks.h @@ -249,17 +249,6 @@ typedef KSIDENTIFIER KSDEGRADE, *PKSDEGRADE; typedef KSIDENTIFIER KSPIN_INTERFACE, *PKSPIN_INTERFACE; typedef KSIDENTIFIER KSPIN_MEDIUM, *PKSPIN_MEDIUM; -#if !defined( _MSC_VER ) -typedef struct { - ULONG FormatSize; - ULONG Flags; - ULONG SampleSize; - ULONG Reserved; - GUID MajorFormat; - GUID SubFormat; - GUID Specifier; -} KSDATAFORMAT, *PKSDATAFORMAT, KSDATARANGE, *PKSDATARANGE; -#else typedef union { struct { ULONG FormatSize; @@ -272,7 +261,7 @@ typedef union { }; LONGLONG Alignment; } KSDATAFORMAT, *PKSDATAFORMAT, KSDATARANGE, *PKSDATARANGE; -#endif + typedef struct {