4 files changed, 9 insertions, 7 deletions
diff --git a/sysdeps/unix/bsd/direntry.h b/sysdeps/unix/bsd/direntry.h
index eb55d57af7..2f563ec306 100644
--- a/sysdeps/unix/bsd/direntry.h
+++ b/sysdeps/unix/bsd/direntry.h
@@ -22,7 +22,7 @@ struct dirent
     unsigned int d_fileno;	/* 32 bits.  */
     unsigned short int d_reclen; /* 16 bits.  */
     unsigned short int d_namlen; /* 16 bits.  */
-    char d_name[0];		/* Variable length.  */
+    char d_name[1];		/* Variable length.  */
   };
 
 #define _DIRENT_HAVE_D_RECLEN 1
diff --git a/sysdeps/unix/common/direntry.h b/sysdeps/unix/common/direntry.h
index 5decd56db6..aa065474bf 100644
--- a/sysdeps/unix/common/direntry.h
+++ b/sysdeps/unix/common/direntry.h
@@ -22,7 +22,7 @@ struct dirent
     unsigned int d_fileno;
     int d_off;			/* Position in directory of following entry. */
     unsigned short int d_reclen;
-    char d_name[0];		/* Variable length.  */
+    char d_name[1];		/* Variable length.  */
   };
 
 #define _DIRENT_HAVE_D_RECLEN 1
diff --git a/sysdeps/unix/sysv/linux/gnu/types.h b/sysdeps/unix/sysv/linux/gnu/types.h
index 7876c408c4..4f1b0961ee 100644
--- a/sysdeps/unix/sysv/linux/gnu/types.h
+++ b/sysdeps/unix/sysv/linux/gnu/types.h
@@ -19,8 +19,10 @@ Cambridge, MA 02139, USA.  */
 #ifndef	_GNU_TYPES_H
 #define	_GNU_TYPES_H	1
 
-/* Get actual type definitions for architecture from kernel headers.  */
-#include <linux/posix_types.h>
+/* Get actual type definitions for architecture from kernel headers.
+   This #define tells <linux/types.h> not to define `dev_t' et al itself.  */
+#define _LINUX_TYPES_DONT_EXPORT
+#include <linux/types.h>
 
 /* Convenience types.  */
 typedef unsigned char __u_char;
diff --git a/sysdeps/unix/sysv/linux/netinet/in.h b/sysdeps/unix/sysv/linux/netinet/in.h
index 2ce224ca43..ebe6b4cf58 100644
--- a/sysdeps/unix/sysv/linux/netinet/in.h
+++ b/sysdeps/unix/sysv/linux/netinet/in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or modify
@@ -36,7 +36,7 @@ enum
     IPPROTO_IDP = 22,	/* XNS IDP protocol.  */
 
     IPPROTO_RAW = 255,	/* Raw IP packets.  */
-    IPPROTO_MAX,
+    IPPROTO_MAX
   };
 
 /* Standard well-known ports.  */
@@ -76,7 +76,7 @@ enum
     IPPORT_RESERVED = 1024,
 
     /* Ports greater this value are reserved for (non-privileged) servers.  */
-    IPPORT_USERRESERVED = 5000,
+    IPPORT_USERRESERVED = 5000
   };