Update of /cvsroot/monetdb/MonetDB/src/common
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11014/MonetDB/src/common
Modified Files:
stream.mx
Log Message:
made Sjoerd's new "iconv" stream implementation compile on Darwin & Solaris:
there, iconv()'s second argument should be of type "ICONV_CONST char **",
not just "char **".
Index: stream.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/common/stream.mx,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- stream.mx 5 Dec 2007 13:44:18 -0000 1.151
+++ stream.mx 6 Dec 2007 19:09:07 -0000 1.152
@@ -2260,7 +2260,7 @@
ic_write(stream *s, const void *buf, size_t elmsize, size_t cnt)
{
struct icstream *ic = (struct icstream *) s->stream_data.p;
- char *inbuf = (char *) buf;
+ ICONV_CONST char *inbuf = (char *) buf;
size_t inbytesleft = elmsize * cnt;
char *outbuf = ic->buffer;
size_t outbytesleft = sizeof(ic->buffer);
@@ -2276,14 +2276,14 @@
ic_read(stream *s, void *buf, size_t elmsize, size_t cnt)
{
struct icstream *ic = (struct icstream *) s->stream_data.p;
- char *inbuf = ic->buffer;
+ ICONV_CONST char *inbuf = ic->buffer;
size_t inbytesleft = ic->buflen;
char *outbuf = (char *) buf;
size_t outbytesleft = elmsize * cnt;
errno = 0;
while (outbytesleft > 0 && errno != E2BIG) {
- stream_read(ic->s, inbuf, 1, 1);
+ stream_read(ic->s, ic->buffer, 1, 1);
inbytesleft++;
iconv(ic->cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
if (inbytesleft == 0)
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
