mirror of https://github.com/odrling/Aegisub
Move iconv include to charset_conv.h
On newer mac sdks iconv_t is defined differently, so it's harder to just have a typedef for it.
This commit is contained in:
parent
9bc3cad79e
commit
b8f4c98c4c
|
@ -23,7 +23,6 @@
|
||||||
#include <boost/range/algorithm.hpp>
|
#include <boost/range/algorithm.hpp>
|
||||||
|
|
||||||
#include <libaegisub/charset_conv.h>
|
#include <libaegisub/charset_conv.h>
|
||||||
#include <iconv.h>
|
|
||||||
|
|
||||||
#include "charset_6937.h"
|
#include "charset_6937.h"
|
||||||
|
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include <libaegisub/exception.h>
|
#include <libaegisub/exception.h>
|
||||||
|
#include <iconv.h>
|
||||||
|
|
||||||
namespace agi {
|
namespace agi {
|
||||||
namespace charset {
|
namespace charset {
|
||||||
|
@ -34,8 +35,6 @@ DEFINE_EXCEPTION(BufferTooSmall, ConversionFailure);
|
||||||
DEFINE_EXCEPTION(BadInput, ConversionFailure);
|
DEFINE_EXCEPTION(BadInput, ConversionFailure);
|
||||||
DEFINE_EXCEPTION(BadOutput, ConversionFailure);
|
DEFINE_EXCEPTION(BadOutput, ConversionFailure);
|
||||||
|
|
||||||
typedef void *iconv_t;
|
|
||||||
|
|
||||||
/// RAII handle for iconv
|
/// RAII handle for iconv
|
||||||
class Iconv {
|
class Iconv {
|
||||||
iconv_t cd;
|
iconv_t cd;
|
||||||
|
|
Loading…
Reference in New Issue