4 files changed, 21 insertions, 19 deletions
diff --git a/sysdeps/generic/netinet/inbits.h b/sysdeps/generic/bits/in.h
index 7241bd24c3..7241bd24c3 100644
--- a/sysdeps/generic/netinet/inbits.h
+++ b/sysdeps/generic/bits/in.h
diff --git a/sysdeps/generic/crypt.h b/sysdeps/generic/crypt.h
index 0fdef1843a..3f8f960140 100644
--- a/sysdeps/generic/crypt.h
+++ b/sysdeps/generic/crypt.h
@@ -29,28 +29,30 @@
 
 __BEGIN_DECLS
 
-struct crypt_data
-{
-  char keysched[(16 * 8) / sizeof (char)];
-  char sb0[32768 / sizeof (char)];
-  char sb1[32768 / sizeof (char)];
-  char sb2[32768 / sizeof (char)];
-  char sb3[32768 / sizeof (char)];
-  /* end-of-alignment-critical-data */
-  char crypt_3_buf[14];
-  char current_salt[2];
-  long current_saltbits;
-  int  direction, initialized;
-};
-
 /* Encrypt at most 8 characters from KEY using salt to perturb DES.  */
 extern char *crypt __P ((__const char *__key, __const char *__salt));
 
 
+#ifdef __USE_GNU
 /* Reentrant versions of the functions above.  The additional argument
    points to a structure where the results are placed in.  */
+struct crypt_data
+  {
+    char keysched[16 * 8];
+    char sb0[32768];
+    char sb1[32768];
+    char sb2[32768];
+    char sb3[32768];
+    /* end-of-alignment-critical-data */
+    char crypt_3_buf[14];
+    char current_salt[2];
+    long int current_saltbits;
+    int direction, initialized;
+  };
+
 extern char *crypt_r __P ((__const char *__key, __const char *__salt,
 			   struct crypt_data *__data));
+#endif
 
 __END_DECLS
 
diff --git a/sysdeps/generic/vlimit.c b/sysdeps/generic/vlimit.c
index 045eece010..5654be1205 100644
--- a/sysdeps/generic/vlimit.c
+++ b/sysdeps/generic/vlimit.c
@@ -43,7 +43,7 @@ vlimit (resource, value)
 	return -1;
 
       lims.rlim_cur = value;
-      return setrlimit(rlimit_res, &lims);
+      return setrlimit (rlimit_res, &lims);
     }
 
   __set_errno (EINVAL);
diff --git a/sysdeps/generic/vtimes.c b/sysdeps/generic/vtimes.c
index 0c19a918f8..e448da6de1 100644
--- a/sysdeps/generic/vtimes.c
+++ b/sysdeps/generic/vtimes.c
@@ -38,8 +38,8 @@ vtimes_one (struct vtimes *vt, enum __rusage_who who)
       if (getrusage (who, &usage) < 0)
 	return -1;
 
-      vt->vm_utime = TIMEVAL_TO_VTIMES(usage.ru_utime);
-      vt->vm_stime = TIMEVAL_TO_VTIMES(usage.ru_stime);
+      vt->vm_utime = TIMEVAL_TO_VTIMES (usage.ru_utime);
+      vt->vm_stime = TIMEVAL_TO_VTIMES (usage.ru_stime);
       vt->vm_idsrss = usage.ru_idrss + usage.ru_isrss;
       vt->vm_majflt = usage.ru_majflt;
       vt->vm_minflt = usage.ru_minflt;
@@ -58,8 +58,8 @@ vtimes (current, child)
      struct vtimes *current;
      struct vtimes *child;
 {
-  if (vtimes_one(current, RUSAGE_SELF) < 0 ||
-      vtimes_one(child, RUSAGE_CHILDREN) < 0)
+  if (vtimes_one (current, RUSAGE_SELF) < 0
+      || vtimes_one (child, RUSAGE_CHILDREN) < 0)
     return -1;
   return 0;
 }