From b8f4c98c4cbc698e4adbba302c2dc328fe193435 Mon Sep 17 00:00:00 2001
From: arch1t3cht <arch1t3cht@gmail.com>
Date: Fri, 13 Oct 2023 23:52:26 +0200
Subject: [PATCH] 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.
---
 libaegisub/common/charset_conv.cpp           | 1 -
 libaegisub/include/libaegisub/charset_conv.h | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/libaegisub/common/charset_conv.cpp b/libaegisub/common/charset_conv.cpp
index 47644eb1c..ae946c6b8 100644
--- a/libaegisub/common/charset_conv.cpp
+++ b/libaegisub/common/charset_conv.cpp
@@ -23,7 +23,6 @@
 #include <boost/range/algorithm.hpp>
 
 #include <libaegisub/charset_conv.h>
-#include <iconv.h>
 
 #include "charset_6937.h"
 
diff --git a/libaegisub/include/libaegisub/charset_conv.h b/libaegisub/include/libaegisub/charset_conv.h
index c283c36ca..806a1197c 100644
--- a/libaegisub/include/libaegisub/charset_conv.h
+++ b/libaegisub/include/libaegisub/charset_conv.h
@@ -23,6 +23,7 @@
 #include <vector>
 
 #include <libaegisub/exception.h>
+#include <iconv.h>
 
 namespace agi {
 	namespace charset {
@@ -34,8 +35,6 @@ DEFINE_EXCEPTION(BufferTooSmall, ConversionFailure);
 DEFINE_EXCEPTION(BadInput, ConversionFailure);
 DEFINE_EXCEPTION(BadOutput, ConversionFailure);
 
-typedef void *iconv_t;
-
 /// RAII handle for iconv
 class Iconv {
 	iconv_t cd;