Update.

1999-12-29  Andreas Jaeger  <aj@suse.de>

	* sysdeps/unix/sysv/linux/alpha/sys/io.h: Don't include
	<asm/io.h>; remove K&R compatibility; add missing ints.

	* sysdeps/unix/sysv/linux/arm/sys/io.h: Remove K&R compatibility,
	add missing ints.

	* sysdeps/unix/sysv/linux/sys/io.h: Don't include <asm/io.h>.

1999-12-29  Andreas Jaeger  <aj@suse.de>

	* manual/getopt.texi (Using Getopt): Document ordering of options.

1999-12-29  Andreas Jaeger  <aj@suse.de>

	* sysdeps/unix/sysv/linux/llseek.c: Emit link time warning for llseek.
	Requested by Michael Deutschmann <michael@talamasca.wkpowerlink.com>.

1999-12-14  Andreas Jaeger  <aj@suse.de>

	* sysdeps/unix/sysv/linux/scsi/scsi.h: Add new defines from Linux
	2.3.32.

1999-12-28  Jakub Jelinek  <jakub@redhat.com>

	* elf/sprof.c (load_shobj): Fix error message.
	(generate_call_graph): Cast %*s length argument to int.
	* locale/programs/localedef.c (construct_output_path): Likewise.
	* locale/programs/ld-ctype.c (ctype_finish): Use proper format
	specifier.
	(ctype_class_new): Likewise.
	* locale/programs/ld-time.c (time_finish): Likewise.
	* sunrpc/svc_simple.c (register_rpc): Likewise.
	* nscd/connections.c (nscd_run, start_threads): Use long instead of
	int to avoid cast warnings.
	* sysdeps/ieee754/ldbl-128/e_atan2l.c (__ieee754_atan2l): Kill
	warning.
	* sysdeps/ieee754/ldbl-128/s_roundl.c (__roundl): Remove unused
	variable se.

	* time/strftime.c (my_strftime): Provide wide era string when
	requested.

	* sysdeps/sparc/fpu/bits/mathinline.h (__signbit, __signbitl):
	Separate into 32bit and 64bit versions.

3 files changed, 17 insertions, 17 deletions

diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
index 0fd430662f..d68f618d0d 100644
--- a/locale/programs/ld-ctype.c
+++ b/locale/programs/ld-ctype.c
@@ -437,7 +437,7 @@ character L'\\u%0*x' in class `%s' must not be in class `%s'"),
 			  {
 			    char buf[17];
 
-			    sprintf (buf, "\\%o", cnt);
+			    sprintf (buf, "\\%zo", cnt);
 
 			    if (!be_quiet)
 			      error (0, 0, _("\
@@ -452,7 +452,7 @@ character '%s' in class `%s' must be in class `%s'"),
 			  {
 			    char buf[17];
 
-			    sprintf (buf, "\\%o", cnt);
+			    sprintf (buf, "\\%zo", cnt);
 
 			    if (!be_quiet)
 			      error (0, 0, _("\
@@ -1021,7 +1021,7 @@ ctype_class_new (struct linereader *lr, struct locale_ctype_t *ctype,
   if (ctype->nr_charclass == MAX_NR_CHARCLASS)
     /* Exit code 2 is prescribed in P1003.2b.  */
     error (2, 0, _("\
-implementation limit: no more than %d character classes allowed"),
+implementation limit: no more than %zd character classes allowed"),
 	   MAX_NR_CHARCLASS);
 
   ctype->classnames[ctype->nr_charclass++] = name;
diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c
index e317fc11a2..0d513964e9 100644
--- a/locale/programs/ld-time.c
+++ b/locale/programs/ld-time.c
@@ -219,7 +219,7 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap)
 	  if (*str != '+' && *str != '-')
 	    {
 	      if (!be_quiet)
-		error (0, 0, _("%s: direction flag in string %d in `era' field"
+		error (0, 0, _("%s: direction flag in string %zd in `era' field"
 			       " is not '+' nor '-'"),
 		       "LC_TIME", idx + 1);
 	      /* Default arbitrarily to '+'.  */
@@ -230,7 +230,7 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap)
 	  if (*++str != ':')
 	    {
 	      if (!be_quiet)
-		error (0, 0, _("%s: direction flag in string %d in `era' field"
+		error (0, 0, _("%s: direction flag in string %zd in `era' field"
 			       " is not a single character"),
 		       "LC_TIME", idx + 1);
 	      (void) strsep (&str, ":");
@@ -243,7 +243,7 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap)
 	  if (endp == str)
 	    {
 	      if (!be_quiet)
-		error (0, 0, _("%s: invalid number for offset in string %d in"
+		error (0, 0, _("%s: invalid number for offset in string %zd in"
 			       " `era' field"),
 		       "LC_TIME", idx + 1);
 	      (void) strsep (&str, ":");
@@ -252,7 +252,7 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap)
 	    {
 	      if (!be_quiet)
 		error (0, 0, _("%s: garbage at end of offset value in"
-			       " string %d in `era' field"),
+			       " string %zd in `era' field"),
 		       "LC_TIME", idx + 1);
 	      (void) strsep (&str, ":");
 	    }
@@ -302,7 +302,7 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap)
 		{
 		invalid_start_date:
 		  if (!be_quiet)
-		    error (0, 0, _("%s: invalid starting date in string %d in"
+		    error (0, 0, _("%s: invalid starting date in string %zd in"
 				   " `era' field"),
 			   "LC_TIME", idx + 1);
 		  (void) strsep (&str, ":");
@@ -312,7 +312,7 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap)
 		garbage_start_date:
 		  if (!be_quiet)
 		    error (0, 0, _("%s: garbage at end of starting date "
-				   "in string %d in `era' field "),
+				   "in string %zd in `era' field "),
 			   "LC_TIME", idx + 1);
 		  (void) strsep (&str, ":");
 		}
@@ -331,7 +331,7 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap)
 			   && !__isleap (time->era_entries[idx].start_date[0])))
 		      && !be_quiet)
 			  error (0, 0, _("%s: starting date is invalid in"
-					 " string %d in `era' field"),
+					 " string %zd in `era' field"),
 				 "LC_TIME", idx + 1);
 		}
 	    }
@@ -379,7 +379,7 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap)
 		{
 		invalid_stop_date:
 		  if (!be_quiet)
-		    error (0, 0, _("%s: invalid stopping date in string %d in"
+		    error (0, 0, _("%s: invalid stopping date in string %zd in"
 				   " `era' field"),
 			   "LC_TIME", idx + 1);
 		  (void) strsep (&str, ":");
@@ -389,7 +389,7 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap)
 		garbage_stop_date:
 		  if (!be_quiet)
 		    error (0, 0, _("%s: garbage at end of stopping date "
-				   "in string %d in `era' field"),
+				   "in string %zd in `era' field"),
 			   "LC_TIME", idx + 1);
 		  (void) strsep (&str, ":");
 		}
@@ -408,7 +408,7 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap)
 			   && !__isleap (time->era_entries[idx].stop_date[0])))
 		      && !be_quiet)
 			  error (0, 0, _("%s: stopping date is invalid in"
-					 " string %d in `era' field"),
+					 " string %zd in `era' field"),
 				 "LC_TIME", idx + 1);
 		}
 	    }
@@ -416,7 +416,7 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap)
 	  if (str == NULL || *str == '\0')
 	    {
 	      if (!be_quiet)
-		error (0, 0, _("%s: missing era name in string %d in `era'"
+		error (0, 0, _("%s: missing era name in string %zd in `era'"
 			       " field"), "LC_TIME", idx + 1);
 	      time->era_entries[idx].name =
 		time->era_entries[idx].format = "";
@@ -428,7 +428,7 @@ time_finish (struct localedef_t *locale, struct charmap_t *charmap)
 	      if (str == NULL || *str == '\0')
 		{
 		  if (!be_quiet)
-		    error (0, 0, _("%s: missing era format in string %d"
+		    error (0, 0, _("%s: missing era format in string %zd"
 				   " in `era' field"),
 			   "LC_TIME", idx + 1);
 		  time->era_entries[idx].name =
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index fa5d3de02b..86b8bff5da 100644
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -356,8 +356,8 @@ construct_output_path (char *path)
       if (normal == NULL)
 	n = asprintf (&result, "%s/%s%c", LOCALEDIR, path, '\0');
       else
-	n = asprintf (&result, "%s/%.*s%s%s%c", LOCALEDIR, startp - path, path,
-		      normal, endp, '\0');
+	n = asprintf (&result, "%s/%.*s%s%s%c", LOCALEDIR,
+		      (int) (startp - path), path, normal, endp, '\0');
 
       endp = result + n;
     }