cc3200: Clean up and reduce use/include of std.h.

4 files changed, 4 insertions, 16 deletions

diff --git a/cc3200/util/fifo.c b/cc3200/util/fifo.c
index 73b2b7161..166f99d98 100644
--- a/cc3200/util/fifo.c
+++ b/cc3200/util/fifo.c
@@ -27,7 +27,6 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "std.h"
 #include "fifo.h"
 
 
diff --git a/cc3200/util/hash.c b/cc3200/util/hash.c
index c25ebb2b0..1ae0c3ce6 100644
--- a/cc3200/util/hash.c
+++ b/cc3200/util/hash.c
@@ -24,7 +24,6 @@
  * THE SOFTWARE.
  */
 
-#include "std.h"
 #include <stdint.h>
 #include <stdbool.h>
 #include "inc/hw_types.h"
diff --git a/cc3200/util/socketfifo.c b/cc3200/util/socketfifo.c
index cfe92a82b..eb25f3be3 100644
--- a/cc3200/util/socketfifo.c
+++ b/cc3200/util/socketfifo.c
@@ -28,7 +28,6 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include <std.h>
 #include "osi.h"
 #include "fifo.h"
 #include "socketfifo.h"
diff --git a/cc3200/util/std.h b/cc3200/util/std.h
index 8368432b9..2b23fb63e 100644
--- a/cc3200/util/std.h
+++ b/cc3200/util/std.h
@@ -24,21 +24,12 @@
  * THE SOFTWARE.
  */
 
-typedef unsigned int size_t;
-
-void *memcpy(void *dest, const void *src, size_t n);
-void *memmove(void *dest, const void *src, size_t n);
-void *memset(void *s, int c, size_t n);
+// This file is needed because in some cases we can't include stdio.h,
+// because the CC3100 socket driver has name clashes with it.
 
-size_t strlen(const char *str);
-int strcmp(const char *s1, const char *s2);
-int strncmp(const char *s1, const char *s2, size_t n);
-char *strcpy(char *dest, const char *src);
-char *strcat(char *dest, const char *src);
-char *strchr(const char *s, int c);
-char *strstr(const char *haystack, const char *needle);
+typedef unsigned int size_t;
 
-int printf(const char *fmt, ...);
 int snprintf(char *str, size_t size, const char *fmt, ...);
 
+// Convenience function, defined in main.c.
 void stoupper (char *str);