CXUX_BROKEN_CONSTANT_CONVERT isn't used anymore.

[p5sagit/p5-mst-13.2.git] / x2p / str.c

diff --git a/x2p/str.c b/x2p/str.c
index 47dc9ec..7cddccb 100644 (file)
--- a/x2p/str.c
+++ b/x2p/str.c
@@ -1,6 +1,7 @@
 /* $RCSfile: str.c,v $$Revision: 4.1 $$Date: 92/08/07 18:29:26 $
  *
- *    Copyright (c) 1991-2001, Larry Wall
+ *    Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1999,
+ *    2001, 2002, by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -282,7 +283,7 @@ str_gets(register STR *str, register FILE *fp)
     if (str->str_len <= cnt)           /* make sure we have the room */
        GROWSTR(&(str->str_ptr), &(str->str_len), cnt+1);
     bp = str->str_ptr;                 /* move these two too to registers */
-    ptr = FILE_ptr(fp);
+    ptr = (STDCHAR*)FILE_ptr(fp);
     for (;;) {
        while (--cnt >= 0) {
            if ((*bp++ = *ptr++) == newline) {
@@ -296,10 +297,10 @@ str_gets(register STR *str, register FILE *fp)
        }
        
        FILE_cnt(fp) = cnt;             /* deregisterize cnt and ptr */
-       FILE_ptr(fp) = ptr;
+       FILE_ptr(fp) = (void*)ptr; /* LHS STDCHAR* cast non-portable */
        i = getc(fp);           /* get more characters */
        cnt = FILE_cnt(fp);
-       ptr = FILE_ptr(fp);             /* reregisterize cnt and ptr */
+       ptr = (STDCHAR*)FILE_ptr(fp);           /* reregisterize cnt and ptr */
 
        bpx = bp - str->str_ptr;        /* prepare for possible relocation */
        GROWSTR(&(str->str_ptr), &(str->str_len), str->str_cur + cnt + 1);
@@ -316,7 +317,7 @@ str_gets(register STR *str, register FILE *fp)
 
 thats_all_folks:
     FILE_cnt(fp) = cnt;                        /* put these back or we're in trouble */
-    FILE_ptr(fp) = ptr;
+    FILE_ptr(fp) = (void*)ptr; /* LHS STDCHAR* cast non-portable */
     *bp = '\0';
     str->str_cur = bp - str->str_ptr;  /* set length */