-
Notifications
You must be signed in to change notification settings - Fork 6.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "[glib] use win_iconv and add subdir for tools"
This reverts commit ccd3e39.
- Loading branch information
Showing
4 changed files
with
25 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
diff --git a/glib/gconvert.c b/glib/gconvert.c | ||
index 3deac78..134ded9 100644 | ||
--- a/glib/gconvert.c | ||
+++ b/glib/gconvert.c | ||
@@ -30,7 +30,8 @@ | ||
#include <stdlib.h> | ||
|
||
#ifdef G_OS_WIN32 | ||
-#include "win_iconv.c" | ||
+#define USE_LIBICONV_GNU | ||
+#include <iconv.h> | ||
#endif | ||
|
||
#ifdef G_PLATFORM_WIN32 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters