Merge changes between r23217 and r23296 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@23297 7b3dc134-2b1b-0410-93df-9e9f96275f8d

3 files changed, 7 insertions, 7 deletions

diff --git a/libc/crypt/crypt.c b/libc/crypt/crypt.c
index b90a46dd6..e429950e2 100644
--- a/libc/crypt/crypt.c
+++ b/libc/crypt/crypt.c
@@ -88,8 +88,8 @@ _ufc_doit_r(itr, __data, res)
 {
   int i;
   long64 l, r, s, *k;
-  register long64 *sb01 = (long64*)__data->sb0;
-  register long64 *sb23 = (long64*)__data->sb2;
+  long64 *sb01 = (long64*)__data->sb0;
+  long64 *sb23 = (long64*)__data->sb2;
 
   l = (((long64)res[0]) << 32) | ((long64)res[1]);
   r = (((long64)res[2]) << 32) | ((long64)res[3]);
diff --git a/libc/crypt/crypt_util.c b/libc/crypt/crypt_util.c
index 99ad321b3..240907989 100644
--- a/libc/crypt/crypt_util.c
+++ b/libc/crypt/crypt_util.c
@@ -553,7 +553,7 @@ small_tables_done:
 }
 
 void
-__init_des()
+__init_des (void)
 {
   __init_des_r(&_ufc_foobar);
 }
diff --git a/libc/crypt/speeds.c b/libc/crypt/speeds.c
index 736239189..0d55ae83b 100644
--- a/libc/crypt/speeds.c
+++ b/libc/crypt/speeds.c
@@ -12,13 +12,13 @@
 #include <stdio.h>
 
 #ifndef SIGVTALRM
-/* 
+/*
  * patch from chip@chinacat.unicom.com (Chip Rosenthal):
  * you may enable it if your system does not include
  * a setitimer() function. You'll have to ensure the
  * existence a environment variable: HZ giving how many
  * ticks goes per second.
- * If not existing in your default environment 50, 60 
+ * If not existing in your default environment 50, 60
  * or even 100 may be the right value. Perhaps you should
  * then use 'time ./ufc 10000' instead of guessing.
  */
@@ -42,7 +42,7 @@ struct tms tstart, tfinish;
 char *crypt(), *fcrypt();
 
 void
-Stop ()
+Stop (void)
 {
     double elapsed;
 #ifdef NO_ITIMER
@@ -76,7 +76,7 @@ static void clearmem(start, cnt)
       *start++ = '\0';
   }
 
-main ()
+main (void)
 {
    char *s;
 #ifdef NO_ITIMER