diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2003-08-26 06:54:55 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2003-08-26 06:54:55 +0000 |
| commit | 311d0d67b97aec4f1dcc91c5af70f0e2600bf410 (patch) | |
| tree | 2dd558a21763a42e5eb905139ff3e0129c70ef54 /winsup/w32api/include/mmsystem.h | |
| parent | c01c82c07ca8b650504b13c69877bfe55d7e4580 (diff) | |
| download | cygnal-311d0d67b97aec4f1dcc91c5af70f0e2600bf410.tar.gz cygnal-311d0d67b97aec4f1dcc91c5af70f0e2600bf410.tar.bz2 cygnal-311d0d67b97aec4f1dcc91c5af70f0e2600bf410.zip | |
2003-08-26 Danny Smith <dannysmith@users.sourceforge.net>
* lib/test.c: Add vfw.h to includes.
* include/mmsystem.h: Add #ifndef guard to definition of
mmioFOURCC macro.
* include/vfw.h: Protect __OBJC__ from COM declarations.
2003-08-26 Filip Navara <xnavara@volny.cz>
* include/vfw.h: New file.
Diffstat (limited to 'winsup/w32api/include/mmsystem.h')
| -rw-r--r-- | winsup/w32api/include/mmsystem.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/winsup/w32api/include/mmsystem.h b/winsup/w32api/include/mmsystem.h index 15ed4c01f..95da48c0b 100644 --- a/winsup/w32api/include/mmsystem.h +++ b/winsup/w32api/include/mmsystem.h @@ -22,6 +22,9 @@ extern "C" { #define TIME_MIDI 16 #define TIME_TICKS 32 #define MAKEFOURCC(c0,c1,c2,c3) ((DWORD)(BYTE)(c0)|((DWORD)(BYTE)(c1)<<8)|((DWORD)(BYTE)(c2)<<16)|((DWORD)(BYTE)(c3)<<24)) +#ifndef mmioFOURCC +#define mmioFOURCC(c0,c1,c2,c3) MAKEFOURCC(c0,c1,c2,c3) +#endif #define MM_JOY1MOVE 0x3A0 #define MM_JOY2MOVE 0x3A1 #define MM_JOY1ZMOVE 0x3A2 @@ -525,7 +528,6 @@ extern "C" { #define FOURCC_DOS mmioFOURCC('D', 'O', 'S', ' ') #define FOURCC_MEM mmioFOURCC('M', 'E', 'M', ' ') #define MMIO_DEFAULTBUFFER 8192 -#define mmioFOURCC(c0,c1,c2,c3) MAKEFOURCC(c0,c1,c2,c3) #define MCIERR_INVALID_DEVICE_ID (MCIERR_BASE+1) #define MCIERR_UNRECOGNIZED_KEYWORD (MCIERR_BASE+3) #define MCIERR_UNRECOGNIZED_COMMAND (MCIERR_BASE+5) |