[vlc-devel] commit: Libiconv for Win64 (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Aug 23 12:09:47 2009 +0200| [a6b5260ec4528aeb1ebcd532b6f82c1f9ce18974] | committer: Jean-Baptiste Kempf 

Libiconv for Win64

Patch by NightStrike

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a6b5260ec4528aeb1ebcd532b6f82c1f9ce18974
---

 extras/contrib/src/Makefile                     |    4 ++++
 extras/contrib/src/Patches/libiconv-win64.patch |   20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index b6d8eb2..635e688 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -450,8 +450,12 @@ libiconv: libiconv-$(LIBICONV_VERSION).tar.gz
 ifdef HAVE_DARWIN_OS
 	patch -p0 < Patches/libiconv.patch
 endif
+ifdef HAVE_WIN64
+	patch -p0 < Patches/libiconv-win64.patch
+endif
 	patch -p0 < Patches/libiconv-autoconf-uclibc.patch
 
+
 ifdef HAVE_DARWIN_OS
 .iconv:
 	touch $@
diff --git a/extras/contrib/src/Patches/libiconv-win64.patch b/extras/contrib/src/Patches/libiconv-win64.patch
new file mode 100644
index 0000000..8b47ad6
--- /dev/null
+++ b/extras/contrib/src/Patches/libiconv-win64.patch
@@ -0,0 +1,20 @@
+diff -ruN libiconv/lib/iconv.c libiconv.new/lib/iconv.c
+--- libiconv/lib/iconv.c	2003-05-22 21:17:40.000000000 +0200
++++ libiconv.new/lib/iconv.c	2009-08-23 12:07:44.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include <iconv.h>
+ 
+ #include <stdlib.h>
++#include <stdint.h>
+ #include <string.h>
+ #include "config.h"
+ #include "localcharset.h"
+@@ -156,7 +157,7 @@
+ };
+ #define stringpool2 ((const char *) &stringpool2_contents)
+ static const struct alias sysdep_aliases[] = {
+-#define S(tag,name,encoding_index) { (int)(long)&((struct stringpool2_t *)0)->stringpool_##tag, encoding_index },
++#define S(tag,name,encoding_index) { (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_##tag, encoding_index },
+ #include "aliases2.h"
+ #undef S
+ };