2010-09-11  Jonathan Yong  <jon_y@users.sourceforge.net>

        * ksmedia.h: Guard REFERENCE_TIME typedef.
        * strmif: Likewise.
        * dxva2api.h: Add guarded REFERENCE_TIME typedef.



git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@3554 4407c894-4637-0410-b4f5-ada5f102cad1

mingw-w64-headers/include/ChangeLog

diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog
index c8e5748..df03b3b 100644
--- a/mingw-w64-headers/include/ChangeLog
+++ b/mingw-w64-headers/include/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-11  Jonathan Yong  <jon_y@users.sourceforge.net>
+
+	* ksmedia.h: Guard REFERENCE_TIME typedef.
+	* strmif: Likewise.
+	* dxva2api.h: Add guarded REFERENCE_TIME typedef.
+
 2010-09-10  Jonathan Yong  <jon_y@users.sourceforge.net>
 
 	* mingw_inc: Rename to psdk_inc.

mingw-w64-headers/include/dxva2api.h

diff --git a/mingw-w64-headers/include/dxva2api.h b/mingw-w64-headers/include/dxva2api.h
index 345d269..507b5eb 100644
--- a/mingw-w64-headers/include/dxva2api.h
+++ b/mingw-w64-headers/include/dxva2api.h
@@ -12,6 +12,11 @@
 extern "C" {
 #endif
 
+#ifndef __REFERENCE_TIME_DEFINED
+#define __REFERENCE_TIME_DEFINED
+typedef LONGLONG REFERENCE_TIME;
+#endif /*__REFERENCE_TIME_DEFINED*/
+
 typedef struct IDirect3DDeviceManager9 IDirect3DDeviceManager9;
 typedef struct IDirectXVideoDecoderService IDirectXVideoDecoderService;
 

mingw-w64-headers/include/ksmedia.h

diff --git a/mingw-w64-headers/include/ksmedia.h b/mingw-w64-headers/include/ksmedia.h
index 3b21d32..1bf4492 100644
--- a/mingw-w64-headers/include/ksmedia.h
+++ b/mingw-w64-headers/include/ksmedia.h
@@ -2453,7 +2453,10 @@
 #define KS__DIBSIZE(bi)		(KS_DIBWIDTHBYTES(bi) *(DWORD)(bi).biHeight)
 #define KS_DIBSIZE(bi)		((bi).biHeight < 0 ? (-1)*(KS__DIBSIZE(bi)) : KS__DIBSIZE(bi))
 
+#ifndef __REFERENCE_TIME_DEFINED
+#define __REFERENCE_TIME_DEFINED
 typedef LONGLONG REFERENCE_TIME;
+#endif /*__REFERENCE_TIME_DEFINED*/
 
 typedef struct tagKS_VIDEOINFOHEADER {
   RECT rcSource;

mingw-w64-headers/include/strmif.h

diff --git a/mingw-w64-headers/include/strmif.h b/mingw-w64-headers/include/strmif.h
index cad3b2a..23665c6 100644
--- a/mingw-w64-headers/include/strmif.h
+++ b/mingw-w64-headers/include/strmif.h
@@ -778,7 +778,12 @@
 
 #define MAX_PIN_NAME 128
 #define MAX_FILTER_NAME 128
-  typedef LONGLONG REFERENCE_TIME;
+
+#ifndef __REFERENCE_TIME_DEFINED
+#define __REFERENCE_TIME_DEFINED
+typedef LONGLONG REFERENCE_TIME;
+#endif /*__REFERENCE_TIME_DEFINED*/
+
   typedef double REFTIME;
   typedef DWORD_PTR HSEMAPHORE;
   typedef DWORD_PTR HEVENT;