From 2bcc2fa8f094de7a4a7d78093dfe62023499e4d8 Mon Sep 17 00:00:00 2001
From: Tylo <tylo@norceresearch.no>
Date: Mon, 15 Jun 2020 21:20:29 +0200
Subject: Fixed including standard include files.

---
 benchmark.c   | 10 +++++-----
 demos.c       |  3 +--
 stc/cdefs.h   |  1 +
 stc/cmap.h    |  2 +-
 stc/cstring.h |  8 ++------
 stc/cvector.h |  2 +-
 6 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/benchmark.c b/benchmark.c
index 2222453a..c7fbc956 100644
--- a/benchmark.c
+++ b/benchmark.c
@@ -1,11 +1,11 @@
-//#include <stdlib.h>
-#include <stdio.h>
-#include <time.h>
-
+#include "stc/crandom.h"
 #include "stc/cstring.h"
 #include "stc/cmap.h"
-#include "stc/crandom.h"
 #include "others/khash.h"
+
+#include <stdio.h>
+#include <time.h>
+
 #ifdef __cplusplus
 #include <unordered_map>
 #include "others/bytell_hash_map.hpp"
diff --git a/demos.c b/demos.c
index a93be53a..2f1cc099 100644
--- a/demos.c
+++ b/demos.c
@@ -1,8 +1,7 @@
-#include <stdlib.h>
-#include "stc/cstring.h"
 #include "stc/cvector.h"
 #include "stc/clist.h"
 #include "stc/cmap.h"
+#include "stc/cstring.h"
 
 
 void stringdemo1()
diff --git a/stc/cdefs.h b/stc/cdefs.h
index 6a0a7998..a5201a25 100644
--- a/stc/cdefs.h
+++ b/stc/cdefs.h
@@ -24,6 +24,7 @@
 #define CDEFS__H__
 
 #include <stdint.h>
+#include <stddef.h>
 #include <stdbool.h>
 
 #if defined(_MSC_VER)
diff --git a/stc/cmap.h b/stc/cmap.h
index e8a7485b..5990dedf 100644
--- a/stc/cmap.h
+++ b/stc/cmap.h
@@ -42,7 +42,7 @@ int main(void) {
 #ifndef CMAP__H__
 #define CMAP__H__
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "cdefs.h"
 
 #define cmap_init          {NULL, NULL, 0, 0, 90, 0}
diff --git a/stc/cstring.h b/stc/cstring.h
index cf635be8..9cbdcfb5 100644
--- a/stc/cstring.h
+++ b/stc/cstring.h
@@ -23,14 +23,10 @@
 #ifndef CSTRING__H__
 #define CSTRING__H__
 
-#include <stdlib.h> /* alloca */
-#include <malloc.h>
-#include <stddef.h>
-#include <stdbool.h>
+#include <stdlib.h> /* alloca, malloc */
 #include <string.h>
-#include <stdint.h>
 #include <stdarg.h>
-#include <stdio.h>
+#include <stdio.h> /* vsnprintf */
 
 #include "cdefs.h"
 
diff --git a/stc/cvector.h b/stc/cvector.h
index 292954b1..cee33e27 100644
--- a/stc/cvector.h
+++ b/stc/cvector.h
@@ -23,7 +23,7 @@
 #ifndef CVECTOR__H__
 #define CVECTOR__H__
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include "cdefs.h"
 
-- 
cgit v1.2.3