From 1e7864e44136433004d5c8adb767dddf90830cb4 Mon Sep 17 00:00:00 2001 From: bstarynk Date: Tue, 6 May 2008 07:25:24 +0000 Subject: 2008-05-06 Basile Starynkevitch MELT branch merged with trunk r134973 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@134974 138bc75d-0d04-0410-961f-82ee72b054a4 --- fixincludes/ChangeLog | 5 +++++ fixincludes/fixincl.c | 2 +- fixincludes/fixlib.c | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'fixincludes') diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index db3ecd0edad..913e34e5c47 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,3 +1,8 @@ +2008-04-25 Kai Tietz + + * fixincl.c (fix_with_system): Cast pointer difference to long. + * fixlib.c (make_raw_shell_str): Cast compare to avoid sign warning. + 2008-04-18 Paolo Bonzini PR bootstrap/35457 diff --git a/fixincludes/fixincl.c b/fixincludes/fixincl.c index a6a8abef027..489f1457ebc 100644 --- a/fixincludes/fixincl.c +++ b/fixincludes/fixincl.c @@ -829,7 +829,7 @@ fix_with_system (tFixDesc* p_fixd, /* * Now add the fix number and file names that may be needed */ - sprintf (pz_scan, " %ld '%s' '%s' '%s'", p_fixd - fixDescList, + sprintf (pz_scan, " %ld '%s' '%s'", (long) (p_fixd - fixDescList), pz_fix_file, pz_file_source, pz_temp_file); } else /* NOT an "internal" fix: */ diff --git a/fixincludes/fixlib.c b/fixincludes/fixlib.c index cc335f5659a..379d604aad7 100644 --- a/fixincludes/fixlib.c +++ b/fixincludes/fixlib.c @@ -259,14 +259,14 @@ make_raw_shell_str( char* pz_d, tCC* pz_s, size_t smax ) *(pz_d++) = '\''; for (;;) { - if (pz_d - pz_d_start >= smax) + if ((size_t) (pz_d - pz_d_start) >= smax) return (char*)NULL; switch (*(pz_d++) = *(pz_s++)) { case NUL: goto loopDone; case '\'': - if (pz_d - pz_d_start >= smax - sizeof( zQ )-1) + if ((size_t) (pz_d - pz_d_start) >= smax - sizeof( zQ )-1) return (char*)NULL; strcpy( pz_d-1, zQ ); pz_d += sizeof( zQ )-2; -- cgit v1.2.1