teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

libc++ fixes: avcodec/avformat workaround

Browse source 
With libc++, string includes stdint.h, which breaks the fragile avformat.h
workaround, which depends on __STDC_CONSTANT_MACROS being defined before
stdint.h is included.

Moving the string inclusion after that eyesore shouldn't break anything.
This commit is contained in:
eroen 2013-05-26 10:36:17 +02:00
parent 5fac75845c
commit 2850032d9e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwsound/ffmpeg_decoder.hpp
View file

@ -1,8 +1,6 @@
#ifndef GAME_SOUND_FFMPEG_DECODER_H #ifndef GAME_SOUND_FFMPEG_DECODER_H
#define GAME_SOUND_FFMPEG_DECODER_H #define GAME_SOUND_FFMPEG_DECODER_H
#include <string>
// FIXME: This can't be right? The headers refuse to build without UINT64_C, // FIXME: This can't be right? The headers refuse to build without UINT64_C,
// which only gets defined in stdint.h in either C99 mode or with this macro // which only gets defined in stdint.h in either C99 mode or with this macro
// defined... // defined...
@ -14,6 +12,8 @@ extern "C"
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
} }
#include <string>
#include "sound_decoder.hpp" #include "sound_decoder.hpp"