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

tools/configsys/Makefile

@@ -2,6 +2,7 @@
 BIN     = config
 SRCS    = main.cpp config.cpp mapping.cpp device.cpp cluster.cpp util.cpp core.cpp gstore.cpp
 OBJS    = main.o config.o mapping.o device.o cluster.o util.o core.o gstore.o
+CXX     = g++
 CXXFLAGS = -Wall -O
 
 all:    .depend $(BIN)

tools/fsutil/block.c

@@ -22,6 +22,7 @@
  * this software.
  */
 #include <stdio.h>
+#include <time.h>
 #include "bsdfs.h"
 
 extern int verbose;

tools/fsutil/bsdfs.h

@@ -77,7 +77,7 @@ typedef struct {
     unsigned        ilock;              /* lock during I list manipulation */
     unsigned        fmod;               /* super block modified flag */
     unsigned        ronly;              /* mounted read-only flag */
-    long            utime;              /* current date of last update */
+    time_t          utime;              /* current date of last update */
     unsigned        tfree;              /* total free blocks */
     unsigned        tinode;             /* total free inodes */
     char            fsmnt [MAXMNTLEN];  /* ordinary file mounted on */
@@ -127,9 +127,9 @@ typedef struct {
 #define SYS_IMMUTABLE   0x0200          /* file may not be changed */
 #define SYS_APPEND      0x0400          /* writes to file may only append */
 
-    long            atime;              /* time last accessed */
-    long            mtime;              /* time last modified */
-    long            ctime;              /* time created */
+    time_t          atime;              /* time last accessed */
+    time_t          mtime;              /* time last modified */
+    time_t          ctime;              /* time created */
 } fs_inode_t;
 
 typedef struct {

tools/fsutil/file.c

@@ -23,6 +23,7 @@
  */
 #include <stdio.h>
 #include <string.h>
+#include <time.h>
 #include "bsdfs.h"
 
 extern int verbose;

tools/fsutil/manifest.c

@@ -131,10 +131,17 @@ static void add_entry (manifest_t *m, int filetype, char *path, char *link,
 /*
  * Compare two entries of file traverse scan.
  */
+#ifdef __FreeBSD__
+static int ftsent_compare (const FTSENT * const *a, const FTSENT *const *b)
+{
+    return strcmp((*a)->fts_name, (*b)->fts_name);
+}
+#else
 static int ftsent_compare (const FTSENT **a, const FTSENT **b)
 {
     return strcmp((*a)->fts_name, (*b)->fts_name);
 }
+#endif
 
 /*
  * Scan the directory and create a manifest from it's contents.

tools/virtualmips/debug.c

@@ -13,6 +13,7 @@
 
 #define _GNU_SOURCE
 #include <sys/signal.h>
+#include <sys/socket.h>
 #include <string.h>
 
 #include "vm.h"