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.
actorid
eroen 12 years ago
parent 5fac75845c
commit 2850032d9e

@ -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…
Cancel
Save