mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-30 15:15:31 +00:00
libc++ fixes: avcodec/avformat workaround
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:
parent
5fac75845c
commit
2850032d9e
1 changed files with 2 additions and 2 deletions
|
@ -1,8 +1,6 @@
|
|||
#ifndef 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,
|
||||
// which only gets defined in stdint.h in either C99 mode or with this macro
|
||||
// defined...
|
||||
|
@ -14,6 +12,8 @@ extern "C"
|
|||
#include <libavformat/avformat.h>
|
||||
}
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "sound_decoder.hpp"
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue