Mercurial > mplayer.hg

changeset 1836:7c1671842ee7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GUID fix
author arpi
date Sun, 02 Sep 2001 17:21:22 +0000
parents fcf2cf04bdf3
children 9fd8b5e0b864
files codec-cfg.h loader/wine/mmreg.h
diffstat 2 files changed, 14 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/codec-cfg.h	Sun Sep 02 15:12:46 2001 +0000
+++ b/codec-cfg.h	Sun Sep 02 17:21:22 2001 +0000
@@ -38,12 +38,16 @@
 #define VFM_DIVX4 7
 #define VFM_RAW 8
 
+#ifndef GUID_TYPE
+#define GUID_TYPE
 typedef struct {
 	unsigned long f1;
 	unsigned short f2;
 	unsigned short f3;
 	unsigned char f4[8];
 } GUID;
+#endif
+
 
 typedef struct {
 	unsigned int fourcc[CODECS_MAX_FOURCC];
--- a/loader/wine/mmreg.h	Sun Sep 02 15:12:46 2001 +0000
+++ b/loader/wine/mmreg.h	Sun Sep 02 17:21:22 2001 +0000
@@ -57,7 +57,16 @@
 } WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX;
 #endif /* _WAVEFORMATEX_ */
 
-#ifdef GUID_DEFINED
+#ifndef GUID_TYPE
+#define GUID_TYPE
+typedef struct
+{
+    unsigned long f1;
+    unsigned short f2;
+    unsigned short f3;
+    unsigned char f4[8];
+} GUID;
+#endif
 
 #ifndef _WAVEFORMATEXTENSIBLE_
 #define _WAVEFORMATEXTENSIBLE_
@@ -93,8 +102,6 @@
 typedef WAVEFORMATIEEEFLOATEX NEAR *NPWAVEFORMATIEEEFLOATEX;
 typedef WAVEFORMATIEEEFLOATEX FAR  *LPWAVEFORMATIEEEFLOATEX;
 
-#endif // GUID_DEFINED
-
 
 /* WAVE form wFormatTag IDs */