mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2024-12-16 17:59:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

cppcharset.c (ICONV_CONST): Define iff !HAVE_ICONV.

Browse Source 
2003-07-07  Andrew Pinski  <pinskia@physics.uc.edu>

	* cppcharset.c (ICONV_CONST): Define iff !HAVE_ICONV.
	(convert_cset): Change inbuf to type ICONV_CONST char.
	* Makefile.in (LIBS): Add LIBICONV.

From-SVN: r69029
This commit is contained in:
Andrew Pinski 2003-07-07 04:46:29 +00:00 committed by Andreas Jaeger
parent 1dbb6ce879
commit 5beadb33d9
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2003-07-07 Andrew Pinski <pinskia@physics.uc.edu>
* cppcharset.c (ICONV_CONST): Define iff !HAVE_ICONV.
(convert_cset): Change inbuf to type ICONV_CONST char.
* Makefile.in (LIBS): Add LIBICONV.
2003-07-06 Art Haas <ahaas@airmail.net>
* f/global.c (ffeglobal_type_string_): Fix obsolete GCC array

2
gcc/Makefile.in
View File

@ -691,7 +691,7 @@ BUILD_LIBDEPS= $(BUILD_LIBIBERTY)
# How to link with both our special library facilities
# and the system's installed libraries.
LIBS = $(INTLLIBS) @LIBS@ $(LIBIBERTY)
LIBS = $(INTLLIBS) @LIBS@ $(LIBIBERTY) $(LIBICONV)
# Any system libraries needed just for GNAT.
SYSLIBS = @GNAT_LIBEXC@

6
gcc/cppcharset.c
View File

@ -81,6 +81,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#define iconv_open(x, y) (errno = EINVAL, (iconv_t)-1)
#define iconv(a,b,c,d,e) (errno = EINVAL, (size_t)-1)
#define iconv_close(x) 0
#define ICONV_CONST
#endif
#if HOST_CHARSET == HOST_CHARSET_ASCII
@ -210,14 +211,15 @@ convert_cset (iconv_t cd, const uchar *from, size_t flen, struct strbuf *to)
}
else
{
char *inbuf, *outbuf;
ICONV_CONST char *inbuf;
char *outbuf;
size_t inbytesleft, outbytesleft;
/* Reset conversion descriptor and check that it is valid. */
if (iconv (cd, 0, 0, 0, 0) == (size_t)-1)
return false;
inbuf = (char *)from;
inbuf = (ICONV_CONST char *)from;
inbytesleft = flen;
outbuf = (char *)to->text + to->len;
outbytesleft = to->asize - to->len;