Commit a6b5260e authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Libiconv for Win64

Patch by NightStrike
parent 95d29a6c
...@@ -449,9 +449,13 @@ libiconv: libiconv-$(LIBICONV_VERSION).tar.gz ...@@ -449,9 +449,13 @@ libiconv: libiconv-$(LIBICONV_VERSION).tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
ifdef HAVE_DARWIN_OS ifdef HAVE_DARWIN_OS
patch -p0 < Patches/libiconv.patch patch -p0 < Patches/libiconv.patch
endif
ifdef HAVE_WIN64
patch -p0 < Patches/libiconv-win64.patch
endif endif
patch -p0 < Patches/libiconv-autoconf-uclibc.patch patch -p0 < Patches/libiconv-autoconf-uclibc.patch
ifdef HAVE_DARWIN_OS ifdef HAVE_DARWIN_OS
.iconv: .iconv:
touch $@ touch $@
......
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
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment