summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--stdio-common/vfprintf.c4
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 40f5eb4631..ad484099d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
+Sun May 12 22:52:22 1996  Bruce Elliott  <belliott@accessone.com>
+
+	* stdio-common/vfprintf.c: Correct handling of unsigned short
+	values.
+
 Mon May 13 12:03:03 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
 
+	* extra-lib.mk (alltype-$(lib)): Put libs in $(objpfx) instead of
+	$(common-objpfx).
+	* Makerules [install-lib.a]: Find them there.
+
 	* sysdeps/unix/sysv/linux/i386/profil-counter.h: New file.
 
 	* extra-lib.mk: Skip the hair if $(object-suffixes-$(lib)) is empty.
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index 193c392eb8..1643f370fd 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -495,8 +495,10 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
 	{								      \
 	  if (is_long)							      \
 	    number.word = va_arg (ap, unsigned long int);		      \
+	  else if (!is_short)						      \
+	    number.word = va_arg (ap, unsigned int);			      \
 	  else								      \
-	    number.word = va_arg (ap, unsigned int); /* Promoted.  */	      \
+	    number.word = (unsigned short int) va_arg (ap, unsigned int);     \
 									      \
 	LABEL (number):							      \
 	  if (prec < 0)							      \