libc: Consolidate size_t definitions

Consolidates the definitions of size_t in the minimal libc library.
This prevents code duplication.

Change-Id: I996990ad9093ebec1f9ba0045d14319e1a243e70
Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>

5 files changed, 30 insertions, 20 deletions

diff --git a/lib/libc/minimal/include/bits/size_t.h b/lib/libc/minimal/include/bits/size_t.h
new file mode 100644
index 000000000..29a5597f2
--- /dev/null
+++ b/lib/libc/minimal/include/bits/size_t.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2016 Wind River Systems, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @file size_t definition
+ */
+
+#if !defined(__size_t_defined)
+#define __size_t_defined
+
+typedef unsigned int size_t;
+
+#endif
diff --git a/lib/libc/minimal/include/stddef.h b/lib/libc/minimal/include/stddef.h
index 35fc5b817..2e1ef666f 100644
--- a/lib/libc/minimal/include/stddef.h
+++ b/lib/libc/minimal/include/stddef.h
@@ -20,11 +20,7 @@
 #define __INC_stddef_h__
 
 #include <bits/null.h>
-
-#if !defined(__size_t_defined)
-#define __size_t_defined
-typedef unsigned int  size_t;
-#endif
+#include <bits/size_t.h>
 
 #if !defined(__ptrdiff_t_defined)
 #define __ptrdiff_t_defined
diff --git a/lib/libc/minimal/include/stdio.h b/lib/libc/minimal/include/stdio.h
index 4649349cd..5839fccb6 100644
--- a/lib/libc/minimal/include/stdio.h
+++ b/lib/libc/minimal/include/stdio.h
@@ -21,16 +21,12 @@
 
 #include <stdarg.h>     /* Needed to get definition of va_list */
 #include <bits/null.h>
+#include <bits/size_t.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if !defined(__size_t_defined)
-#define __size_t_defined
-typedef unsigned int  size_t;
-#endif
-
 #if !defined(__FILE_defined)
 #define __FILE_defined
 typedef int  FILE;
diff --git a/lib/libc/minimal/include/stdlib.h b/lib/libc/minimal/include/stdlib.h
index 8f855914f..4a89a7628 100644
--- a/lib/libc/minimal/include/stdlib.h
+++ b/lib/libc/minimal/include/stdlib.h
@@ -21,16 +21,12 @@
 
 #include <ctype.h>
 #include <bits/null.h>
+#include <bits/size_t.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if !defined(__size_t_defined)
-#define __size_t_defined
-typedef unsigned int  size_t;
-#endif
-
 unsigned long int strtoul(const char *str, char **endptr, int base);
 long int strtol(const char *str, char **endptr, int base);
 int atoi(const char *s);
diff --git a/lib/libc/minimal/include/string.h b/lib/libc/minimal/include/string.h
index 9813166f4..51456d8a2 100644
--- a/lib/libc/minimal/include/string.h
+++ b/lib/libc/minimal/include/string.h
@@ -20,16 +20,12 @@
 #define __INC_string_h__
 
 #include <bits/null.h>
+#include <bits/size_t.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if !defined(__size_t_defined)
-#define __size_t_defined
-typedef unsigned int  size_t;
-#endif
-
 extern char  *strcpy(char *restrict d, const char *restrict s);
 extern char  *strncpy(char *restrict d, const char *restrict s, size_t n);
 extern char  *strchr(const char *s, int c);