diff options
| author | Thomas Schwinge <thomas@schwinge.name> | 2011-10-10 12:19:20 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@schwinge.name> | 2011-10-10 12:19:44 +0200 |
| commit | 7497bcf50bbffcf2680437b9fe0decf0d1bdec7a (patch) | |
| tree | 7829bce9a2335fac5425c82c0ae538bff9b716f0 /linux/dev/lib/vsprintf.c | |
| parent | aa60c6a6ab31c0e86243d82f4f67687c3f8ac86c (diff) | |
| parent | 729f452a4ff186ae6990c6a3abd1705f42731343 (diff) | |
Merge commit '729f452a4ff186ae6990c6a3abd1705f42731343' into master-user_level_drivers
* Makefrag.am: Resolve conflict.
* linux/dev/arch/i386/kernel/irq.c (install_user_intr_handler): Use
EAGAIN instead of LINUX_EAGAIN, and ENOMEM instead of LINUX_ENOMEM.
Diffstat (limited to 'linux/dev/lib/vsprintf.c')
| -rw-r--r-- | linux/dev/lib/vsprintf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/dev/lib/vsprintf.c b/linux/dev/lib/vsprintf.c index 0beb7471..541ec650 100644 --- a/linux/dev/lib/vsprintf.c +++ b/linux/dev/lib/vsprintf.c @@ -328,9 +328,9 @@ linux_vsprintf (char *buf, const char *fmt, va_list args) num = va_arg (args, unsigned long); else if (qualifier == 'h') if (flags & SIGN) - num = va_arg (args, short); + num = (short) va_arg (args, int); else - num = va_arg (args, unsigned short); + num = (unsigned short) va_arg (args, unsigned int); else if (flags & SIGN) num = va_arg (args, int); else |