cppcharset.c: Use the correct return type for the fallback iconv macro.

2003-07-05  Zack Weinberg  <zack@codesourcery.com>

	* cppcharset.c: Use the correct return type for the fallback iconv
	macro.

From-SVN: r68974

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bb80f8f2d5e9241dcf530c1300469ad99975d48f..dc5696652a131f26091a8c95800545a414787edc 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-05  Zack Weinberg  <zack@codesourcery.com>
+
+       * cppcharset.c: Use the correct return type for the fallback iconv
+       macro.
+
 Sat Jul  5 16:18:53 CEST 2003  Zdenek Dvorak  <rakdver@atrey.karlin.mff.cuni.cz>
 
        Blame to Jan Hubicka  <jh@suse.cz>
@@ -6,7 +11,7 @@ Sat Jul  5 16:18:53 CEST 2003  Zdenek Dvorak  <rakdver@atrey.karlin.mff.cuni.cz>
 
 2003-07-05  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 
-       * expr.c (expand_expr, case COMPONENT_REF): When seeing if should use 
+       * expr.c (expand_expr, case COMPONENT_REF): When seeing if should use
        bitfield operations, use STRICT_ALIGNMENT, not SLOW_UNALIGNED_ACCESS
        if EXPAND_CONST_ADDRESS or EXPAND_INITIALIZER.
 

diff --git a/gcc/cppcharset.c b/gcc/cppcharset.c
index 0ba7e930ab0ab8f584dfd7abb01f9c7296d8db51..84187b9810e93b1a554f245c1cda4cf637d9bdd6 100644 (file)
--- a/gcc/cppcharset.c
+++ b/gcc/cppcharset.c
@@ -79,7 +79,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    below, which are guarded only by if statements with compile-time
    constant conditions, do not cause link errors.  */
 #define iconv_open(x, y) (errno = EINVAL, (iconv_t)-1)
-#define iconv(a,b,c,d,e) (errno = EINVAL, (iconv_t)-1)
+#define iconv(a,b,c,d,e) (errno = EINVAL, (size_t)-1)
 #define iconv_close(x)   0
 #endif