1 diff -riwBu -Xex libiconv-1.11\config.h.msvc libiconv-1.11-modified\config.h.msvc
\r
2 --- libiconv-1.11\config.h.msvc Wed Jul 19 21:10:22 2006
\r
3 +++ libiconv-1.11-modified\config.h.msvc Sat Oct 14 01:36:15 2006
\r
5 /* config.h.in. Generated from configure.ac by autoheader. */
\r
7 +#define EXEEXT '.exe'
\r
9 +typedef __int8 uint8_t;
\r
10 +typedef __int16 uint16_t;
\r
11 +typedef __int32 uint32_t;
\r
13 /* Define to the number of bits in type 'int16_t'. */
\r
14 #undef BITSIZEOF_INT16_T
\r
16 diff -riwBu -Xex libiconv-1.11\lib\Makefile.msvc libiconv-1.11-modified\lib\Makefile.msvc
\r
17 --- libiconv-1.11\lib\Makefile.msvc Thu Jan 06 18:37:08 2005
\r
18 +++ libiconv-1.11-modified\lib\Makefile.msvc Fri Oct 20 12:25:08 2006
\r
20 # iconv.dll and iconv.lib are created together.
\r
21 iconv.lib : $(OBJECTS) $(RESOURCES)
\r
22 $(CC) $(MFLAGS) $(DEBUGFLAGS) -LD $(OBJECTS) $(RESOURCES) -Feiconv.dll
\r
23 + mt.exe -manifest iconv.dll.manifest -outputresource:iconv.dll;2
\r
25 iconv.res : $(srcdir)/../windows/iconv.rc
\r
26 rc -Fo iconv.res $(srcdir)/../windows/iconv.rc
\r
27 diff -riwBu -Xex libiconv-1.11\libcharset\lib\Makefile.msvc libiconv-1.11-modified\libcharset\lib\Makefile.msvc
\r
28 --- libiconv-1.11\libcharset\lib\Makefile.msvc Thu Jan 06 18:46:04 2005
\r
29 +++ libiconv-1.11-modified\libcharset\lib\Makefile.msvc Sat Oct 21 23:23:55 2006
\r
31 # charset.dll and charset.lib are created together.
\r
32 charset.lib : $(OBJECTS) $(RESOURCES)
\r
33 $(CC) $(MFLAGS) $(DEBUGFLAGS) -LD $(OBJECTS) $(RESOURCES) -Fecharset.dll
\r
34 + mt.exe -manifest charset.dll.manifest -outputresource:charset.dll;2
\r
36 charset.res : $(srcdir)/../windows/charset.rc
\r
37 rc -Fo charset.res $(srcdir)/../windows/charset.rc
\r
38 diff -riwBu -Xex libiconv-1.11\src\Makefile.msvc libiconv-1.11-modified\src\Makefile.msvc
\r
39 --- libiconv-1.11\src\Makefile.msvc Sun May 18 13:27:30 2003
\r
40 +++ libiconv-1.11-modified\src\Makefile.msvc Fri Oct 20 12:24:14 2006
\r
46 all : iconv_no_i18n.exe iconv.exe
\r
51 # This is the temporary iconv executable, without internationalization.
\r
55 iconv_no_i18n.exe : $(srcdir)/iconv_no_i18n.c $(srcdir)/iconv.c ../srclib/icrt.lib ../lib/iconv.lib
\r
56 $(CC) $(INCLUDES) -I..\lib $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" $(srcdir)/iconv_no_i18n.c ../srclib/icrt.lib ../lib/iconv.lib -Feiconv_no_i18n.exe
\r
57 + mt.exe -manifest iconv_no_i18n.exe.manifest -outputresource:iconv_no_i18n.exe;1
\r
58 $(RM) iconv_no_i18n.obj
\r
60 copy ..\lib\iconv.dll iconv.dll
\r
65 iconv.exe : $(srcdir)/iconv.c ../srclib/icrt.lib ../lib/iconv.lib
\r
66 $(CC) $(INCLUDES) -I..\lib $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" $(srcdir)/iconv.c ../srclib/icrt.lib $(LIBINTL) ../lib/iconv.lib -Feiconv.exe
\r
67 + mt.exe -manifest iconv.exe.manifest -outputresource:iconv.exe;1
\r
70 copy ..\lib\iconv.dll iconv.dll
\r
71 diff -riwBu -Xex libiconv-1.11\srclib\Makefile.msvc libiconv-1.11-modified\srclib\Makefile.msvc
\r
72 --- libiconv-1.11\srclib\Makefile.msvc Sat Jan 24 11:11:24 2004
\r
73 +++ libiconv-1.11-modified\srclib\Makefile.msvc Fri Oct 13 22:54:03 2006
\r
75 xmalloc.obj xstrdup.obj \
\r
78 - setenv.obj unsetenv.obj
\r
79 + setenv.obj unsetenv.obj width.obj
\r
85 unsetenv.obj : unsetenv.c
\r
86 $(CC) $(INCLUDES) $(CFLAGS) -c unsetenv.c
\r
88 +width.obj : width.c
\r
89 + $(CC) $(INCLUDES) $(CFLAGS) -c width.c
\r
91 icrt.lib : $(OBJECTS)
\r
93 diff -riwBu -Xex libiconv-1.11\srclib\progreloc.c libiconv-1.11-modified\srclib\progreloc.c
\r
94 --- libiconv-1.11\srclib\progreloc.c Wed May 17 12:12:44 2006
\r
95 +++ libiconv-1.11-modified\srclib\progreloc.c Fri Oct 13 22:23:31 2006
\r
97 the filenames may have undergone a case conversion since
\r
98 they were packaged. In other words, EXEEXT may be ".exe"
\r
99 on one system and ".EXE" on another. */
\r
100 - static const char exeext[] = EXEEXT;
\r
101 + static const char exeext = EXEEXT;
\r
102 const char *s1 = argv0 + argv0_len - exeext_len;
\r
103 const char *s2 = exeext;
\r
104 for (; *s1 != '\0'; s1++, s2++)
\r
105 diff -riwBu -Xex libiconv-1.11\srclib\unitypes.h libiconv-1.11-modified\srclib\unitypes.h
\r
106 --- libiconv-1.11\srclib\unitypes.h Thu May 19 18:58:24 2005
\r
107 +++ libiconv-1.11-modified\srclib\unitypes.h Fri Oct 13 22:37:58 2006
\r
109 #define _UNITYPES_H
\r
111 /* Get uint8_t, uint16_t, uint32_t. */
\r
112 +#ifdef FULL_PATH_STDINT_H
\r
113 #include <stdint.h>
\r
116 /* Type representing a Unicode character. */
\r
117 typedef uint32_t ucs4_t;
\r
118 diff -riwBu -Xex libiconv-1.11\srclib\unsetenv.c libiconv-1.11-modified\srclib\unsetenv.c
\r
119 --- libiconv-1.11\srclib\unsetenv.c Sat Jun 17 17:51:52 2006
\r
120 +++ libiconv-1.11-modified\srclib\unsetenv.c Fri Oct 13 22:24:29 2006
\r
123 #include <stdlib.h>
\r
124 #include <string.h>
\r
126 +#ifdef HAVE_UNISTD_H
\r
127 #include <unistd.h>
\r
131 # define __environ environ
\r