From 08fda020e415292d445ce8ea7691dfa25a93309e Mon Sep 17 00:00:00 2001
From: Jeff Harris <jeff@1amstudios.com>
Date: Mon, 18 Nov 2019 10:48:16 -0800
Subject: [PATCH] clean up references to c stdlib

---
 src/DETHRACE/source/common/pedestrn.c |  2 ++
 src/DETHRACE/source/pc-dos/dossys.c   |  5 ++-
 src/types/dr_types.h                  | 51 ++-------------------------
 3 files changed, 8 insertions(+), 50 deletions(-)

diff --git a/src/DETHRACE/source/common/pedestrn.c b/src/DETHRACE/source/common/pedestrn.c
index ec9500fd..e10fcb6e 100644
--- a/src/DETHRACE/source/common/pedestrn.c
+++ b/src/DETHRACE/source/common/pedestrn.c
@@ -1,5 +1,7 @@
 #include "pedestrn.h"
 
+#include <time.h>
+
 int gPed_gib_counts[4][5];
 int gPed_gib_maxes[4][5];
 tPedestrian_instruction gPed_instrucs[100];
diff --git a/src/DETHRACE/source/pc-dos/dossys.c b/src/DETHRACE/source/pc-dos/dossys.c
index 84390676..985715a1 100644
--- a/src/DETHRACE/source/pc-dos/dossys.c
+++ b/src/DETHRACE/source/pc-dos/dossys.c
@@ -1,5 +1,8 @@
 #include "dossys.h"
 
+#include <time.h>
+#include <sys/stat.h>
+
 int gASCII_table[128];
 tU32 gKeyboard_bits[8];
 int gASCII_shift_table[128];
@@ -526,7 +529,7 @@ void CriticalISR(INTPACK pRegs) {
 // EDX: pFile_name
 // EBX: pMin_size
 int PDCheckDriveExists2(char *pThe_path, char *pFile_name, tU32 pMin_size) {
-    stat buf;
+    struct stat buf;
     void (*old_critical_isr)();
     int stat_failed;
     char slasher[4];
diff --git a/src/types/dr_types.h b/src/types/dr_types.h
index a953c193..3834cb9d 100644
--- a/src/types/dr_types.h
+++ b/src/types/dr_types.h
@@ -3154,8 +3154,8 @@ typedef struct tQueued_headup {
     char text[256];
 } tQueued_headup;
 
-typedef unsigned long time_t;
-typedef unsigned long clock_t;
+//typedef unsigned long time_t;
+//typedef unsigned long clock_t;
 typedef struct tFlicette {
     int flic_index;
     int x[2];
@@ -4345,11 +4345,6 @@ typedef struct tRM_info {
     unsigned short SS;
 } tRM_info;
 
-typedef unsigned int ino_t;
-typedef int dev_t;
-//typedef long off_t;  // Conflicts with __darwin_off_t on OSX
-typedef long off_t_;
-
 typedef enum dosio_event_type {
     DOSIO_EVENT_KEY_DOWN = 0,
     DOSIO_EVENT_KEY_UP = 1,
@@ -4384,48 +4379,6 @@ typedef struct dosio_event_queue {
     dosio_event slots[1];
 } dosio_event_queue;
 
-typedef struct _stat {
-    dev_t st_dev;
-    ino_t st_ino;
-    unsigned short st_mode;
-    short st_nlink;
-    unsigned long st_uid;
-    short st_gid;
-    dev_t st_rdev;
-    off_t_ st_size;
-    time_t st_atime;
-    time_t st_mtime;
-    time_t st_ctime;
-    time_t st_btime;
-    unsigned long st_attr;
-    unsigned long st_archivedID;
-    unsigned long st_updatedID;
-    unsigned short st_inheritedRightsMask;
-    unsigned char st_originatingNameSpace;
-    unsigned char st_name[13];
-} _stat;
-
-typedef struct stat {
-    dev_t st_dev;
-    ino_t st_ino;
-    unsigned short st_mode;
-    short st_nlink;
-    unsigned long st_uid;
-    short st_gid;
-    dev_t st_rdev;
-    off_t_ st_size;
-    time_t st_atime;
-    time_t st_mtime;
-    time_t st_ctime;
-    time_t st_btime;
-    unsigned long st_attr;
-    unsigned long st_archivedID;
-    unsigned long st_updatedID;
-    unsigned short st_inheritedRightsMask;
-    unsigned char st_originatingNameSpace;
-    unsigned char st_name[13];
-} stat;
-
 typedef struct tMem_info {
     unsigned int largest_block_avail;
     unsigned int max_unlocked_page;