Mercurial > ecos
changeset 2404:ef95b9adfb61
Add (char *) casts to make GCC/4.2.x happy.
| author | gthomas |
|---|---|
| date | Mon, 02 Jul 2007 11:48:59 +0000 |
| parents | c8ccde18c7f3 |
| children | 9486e0f8136d |
| files | packages/kernel/current/ChangeLog packages/kernel/current/src/common/thread.cxx packages/kernel/current/src/debug/dbg_gdb.cxx packages/language/c/libc/i18n/current/ChangeLog packages/language/c/libc/i18n/current/src/locale.cxx packages/language/c/libc/startup/current/ChangeLog packages/language/c/libc/startup/current/cdl/startup.cdl packages/language/c/libc/stdio/current/ChangeLog packages/language/c/libc/stdio/current/src/output/vfnprintf.cxx |
| diffstat | 9 files changed, 38 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/kernel/current/ChangeLog +++ b/packages/kernel/current/ChangeLog @@ -1,3 +1,9 @@ +2007-07-02 Gary Thomas <gary@mlbassoc.com> + + * src/debug/dbg_gdb.cxx: + * src/common/thread.cxx (Cyg_IdleThread): Add (char *) casts + to make GCC/4.2.x happy. + 2007-06-11 Nick Garnett <nickg@ecoscentric.com> * tests/klock.c (entry0, entry1): Modify mbox part of test to
--- a/packages/kernel/current/src/common/thread.cxx +++ b/packages/kernel/current/src/common/thread.cxx @@ -1268,7 +1268,7 @@ Cyg_IdleThread::Cyg_IdleThread() : Cyg_Thread( CYG_THREAD_MIN_PRIORITY, idle_thread_main, 0, - "Idle Thread", + (char *)"Idle Thread", (CYG_ADDRESS)idle_thread_stack[this-&idle_thread[0]], CYGNUM_KERNEL_THREADS_IDLE_STACK_SIZE) {
--- a/packages/kernel/current/src/debug/dbg_gdb.cxx +++ b/packages/kernel/current/src/debug/dbg_gdb.cxx @@ -241,7 +241,7 @@ static char *dbg_addint(char *s, int n, char buf[16]; char sign = '+'; cyg_count8 bpos; - char *digits = "0123456789ABCDEF"; + char *digits = (char *)"0123456789ABCDEF"; if( n < 0 ) n = -n, sign = '-'; @@ -296,36 +296,36 @@ externC int dbg_threadinfo( if( thread->get_state() & Cyg_Thread::SUSPENDED ) { - sbp = dbg_addstr( sbp, "suspended+"); + sbp = dbg_addstr( sbp, (char *)"suspended+"); } switch( thread->get_state() & ~Cyg_Thread::SUSPENDED ) { case Cyg_Thread::RUNNING: if ( Cyg_Scheduler::get_current_thread() == thread ) { - s = "running"; break; + s = (char *)"running"; break; } else if ( thread->get_state() & Cyg_Thread::SUSPENDED ) { - s = ""; sbp--; /*kill '+'*/ break; + s = (char *)""; sbp--; /*kill '+'*/ break; } else { - s = "ready"; break; + s = (char *)"ready"; break; } case Cyg_Thread::SLEEPING: - s = "sleeping"; break; + s = (char *)"sleeping"; break; case Cyg_Thread::COUNTSLEEP | Cyg_Thread::SLEEPING: case Cyg_Thread::COUNTSLEEP: - s = "counted sleep"; break; + s = (char *)"counted sleep"; break; case Cyg_Thread::CREATING: - s = "creating"; sbp = statebuf; break; + s = (char *)"creating"; sbp = statebuf; break; case Cyg_Thread::EXITED: - s = "exited"; sbp = statebuf; break; + s = (char *)"exited"; sbp = statebuf; break; default: - s = "unknown state"; break; + s = (char *)"unknown state"; break; } sbp = dbg_addstr( sbp, s ); - sbp = dbg_addstr( sbp, ", Priority: " ); + sbp = dbg_addstr( sbp, (char *)", Priority: " ); sbp = dbg_adddec( sbp, thread->get_priority() ); info->thread_display = statebuf;
--- a/packages/language/c/libc/i18n/current/ChangeLog +++ b/packages/language/c/libc/i18n/current/ChangeLog @@ -1,3 +1,7 @@ +2007-07-02 Gary Thomas <gary@mlbassoc.com> + + * src/locale.cxx: Add (char *) casts to make GCC/4.2.x happy. + 2006-08-28 Sergei Gavrikov <w3sg@SoftHome.net> * src/wcstombs.cxx (wcstombs): unused variable removed.
--- a/packages/language/c/libc/i18n/current/src/locale.cxx +++ b/packages/language/c/libc/i18n/current/src/locale.cxx @@ -70,8 +70,8 @@ // define the "C" locale static const Cyg_libc_locale_t C_locale = { - "C", - { ".", "", "", "", "", "", "", "", "", "", + (char *)"C", + { (char *)".", (char *)"", (char *)"", (char *)"", (char *)"", (char *)"", (char *)"", (char *)"", (char *)"", (char *)"", CHAR_MAX, CHAR_MAX, CHAR_MAX, CHAR_MAX, CHAR_MAX, CHAR_MAX, CHAR_MAX, CHAR_MAX },
--- a/packages/language/c/libc/startup/current/ChangeLog +++ b/packages/language/c/libc/startup/current/ChangeLog @@ -1,3 +1,7 @@ +2007-07-02 Gary Thomas <gary@mlbassoc.com> + + * cdl/startup.cdl: Add (char *) casts to make GCC/4.2.x happy. + 2003-03-07 Jonathan Larmour <jifl@eCosCentric.com> * src/mainthread.cxx: Align stack to relevant architecture alignment.
--- a/packages/language/c/libc/startup/current/cdl/startup.cdl +++ b/packages/language/c/libc/startup/current/cdl/startup.cdl @@ -88,7 +88,7 @@ cdl_package CYGPKG_LIBC_STARTUP { cdl_option CYGDAT_LIBC_ARGUMENTS { display "Arguments to main()" flavor data - default_value {"{\"\", NULL}"} + default_value {"{(char *)\"\", (char *)NULL}"} description " This option allows the setting of the arguments to the main function. This only has any effect
--- a/packages/language/c/libc/stdio/current/ChangeLog +++ b/packages/language/c/libc/stdio/current/ChangeLog @@ -1,3 +1,7 @@ +2007-07-02 Gary Thomas <gary@mlbassoc.com> + + * src/output/vfnprintf.cxx: Add (char *) casts to make GCC/4.2.x happy. + 2007-02-05 Sergei Organov <osv@javad.com> * src/output/vfnprintf.cxx (vfnprintf): while formatting integers
--- a/packages/language/c/libc/stdio/current/src/output/vfnprintf.cxx +++ b/packages/language/c/libc/stdio/current/src/output/vfnprintf.cxx @@ -476,13 +476,13 @@ reswitch: switch (ch) { /* NOSTRICT */ _uquad = (unsigned long)va_arg(arg, void *); base = HEX; - xdigs = "0123456789abcdef"; + xdigs = (char *)"0123456789abcdef"; flags |= HEXPREFIX; ch = 'x'; goto nosign; case 's': if ((cp = va_arg(arg, char *)) == NULL) - cp = "(null)"; + cp = (char *)"(null)"; if (prec >= 0) { /* * can't use strlen; can only look for the @@ -509,10 +509,10 @@ reswitch: switch (ch) { base = DEC; goto nosign; case 'X': - xdigs = "0123456789ABCDEF"; + xdigs = (char *)"0123456789ABCDEF"; goto hex; case 'x': - xdigs = "0123456789abcdef"; + xdigs = (char *)"0123456789abcdef"; hex: _uquad = UARG(); base = HEX; /* leading 0x/X only if non-zero */ @@ -583,7 +583,7 @@ number: if ((dprec = pre break; default: - cp = "bug in vfprintf: bad base"; + cp = (char *)"bug in vfprintf: bad base"; size = strlen(cp); goto skipsize; }