Merge branch 'master' of github.com:RetroBSD/retrobsd

src/cmd/ar/ar.c

@@ -38,6 +38,7 @@
 #   include <stdio.h>
 #   include <string.h>
 #   include <stdlib.h>
+#   include <time.h>
 #   include <errno.h>
 #   include <getopt.h>
 #else

src/cmd/ar/archive.h

@@ -97,7 +97,7 @@ typedef struct {
 /* Header structure internal format. */
 typedef struct {
 	off_t size;			/* size of the object in bytes */
-	long date;			/* date */
+	time_t date;			/* date */
 	int lname;			/* size of the long name in bytes */
 	int gid;			/* group */
 	int uid;			/* owner */

src/cmd/smux/linux/smux.c

@@ -2,7 +2,7 @@
 #include <fcntl.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>
-#include <sys/termios.h>
+#include <termios.h>
 #include <strings.h>
 #include <errno.h>
 #include <unistd.h>