# HG changeset patch # User arpi # Date 999451282 0 # Node ID 7c1671842ee7251d4a787f95c804437ea6a67fe5 # Parent fcf2cf04bdf3d7a2df373c6fde4b483a823dd727 GUID fix diff -r fcf2cf04bdf3 -r 7c1671842ee7 codec-cfg.h --- 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]; diff -r fcf2cf04bdf3 -r 7c1671842ee7 loader/wine/mmreg.h --- 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 */