From 58040ce94b8e44025783ec0fff560f549a6724f1 Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Wed, 7 Dec 2011 01:10:43 +0000
Subject: [PATCH] NO! you break api. you made my e sit here with a segv in a
 getenv. because now many libraries and api's don't have prototyopes for
 malloc/calloc and much more and this goes horribly wrong especially on 64bit!
 the eina headers have provided these includes historically and removing them
 is a BREAK in api. apps that used to compile and run just fine now don't.
 it's unacceptable to break api.

i'm stuck here in unity for crying out loud! this deservves a big FAT
REVERT for that! :-P



SVN revision: 65983
---
 legacy/eina/src/include/eina_array.h              | 2 ++
 legacy/eina/src/include/eina_inline_array.x       | 2 ++
 legacy/eina/src/include/eina_inline_f32p32.x      | 2 ++
 legacy/eina/src/include/eina_inline_str.x         | 2 --
 legacy/eina/src/include/eina_inline_stringshare.x | 1 +
 legacy/eina/src/include/eina_list.h               | 2 ++
 legacy/eina/src/include/eina_log.h                | 1 +
 legacy/eina/src/include/eina_matrixsparse.h       | 2 ++
 legacy/eina/src/include/eina_rbtree.h             | 2 ++
 legacy/eina/src/include/eina_str.h                | 1 +
 legacy/eina/src/include/eina_unicode.h            | 2 ++
 11 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/legacy/eina/src/include/eina_array.h b/legacy/eina/src/include/eina_array.h
index 6f0df458dd..d33f5e976c 100644
--- a/legacy/eina/src/include/eina_array.h
+++ b/legacy/eina/src/include/eina_array.h
@@ -19,6 +19,8 @@
 #ifndef EINA_ARRAY_H_
 #define EINA_ARRAY_H_
 
+#include <stdlib.h>
+
 #include "eina_config.h"
 
 #include "eina_types.h"
diff --git a/legacy/eina/src/include/eina_inline_array.x b/legacy/eina/src/include/eina_inline_array.x
index b946a7954f..0f854464bb 100644
--- a/legacy/eina/src/include/eina_inline_array.x
+++ b/legacy/eina/src/include/eina_inline_array.x
@@ -21,6 +21,8 @@
 
 #include <stddef.h>
 
+#include <stdio.h>
+
 /**
  * @cond LOCAL
  */
diff --git a/legacy/eina/src/include/eina_inline_f32p32.x b/legacy/eina/src/include/eina_inline_f32p32.x
index 3c72ca2052..73480de02c 100644
--- a/legacy/eina/src/include/eina_inline_f32p32.x
+++ b/legacy/eina/src/include/eina_inline_f32p32.x
@@ -19,6 +19,8 @@
 #ifndef EINA_INLINE_F32P32_X_
 # define EINA_INLINE_F32P32_X_
 
+#include <stdlib.h>
+
 static inline Eina_F32p32
 eina_f32p32_add(Eina_F32p32 a, Eina_F32p32 b)
 {
diff --git a/legacy/eina/src/include/eina_inline_str.x b/legacy/eina/src/include/eina_inline_str.x
index bac55e7c49..2daeb8524c 100644
--- a/legacy/eina/src/include/eina_inline_str.x
+++ b/legacy/eina/src/include/eina_inline_str.x
@@ -19,8 +19,6 @@
 #ifndef EINA_STR_INLINE_H_
 #define EINA_STR_INLINE_H_
 
-#include <string.h>
-
 /**
  * @addtogroup Eina_String_Group String
  *
diff --git a/legacy/eina/src/include/eina_inline_stringshare.x b/legacy/eina/src/include/eina_inline_stringshare.x
index 1d5693278f..bfd7677341 100644
--- a/legacy/eina/src/include/eina_inline_stringshare.x
+++ b/legacy/eina/src/include/eina_inline_stringshare.x
@@ -19,6 +19,7 @@
 #ifndef EINA_STRINGSHARE_INLINE_H_
 #define EINA_STRINGSHARE_INLINE_H_
 
+#include <string.h>
 #include "eina_stringshare.h"
 /**
  * @addtogroup Eina_Stringshare_Group Stringshare
diff --git a/legacy/eina/src/include/eina_list.h b/legacy/eina/src/include/eina_list.h
index 246a589282..8a8f25ea7f 100644
--- a/legacy/eina/src/include/eina_list.h
+++ b/legacy/eina/src/include/eina_list.h
@@ -19,6 +19,8 @@
 #ifndef EINA_LIST_H_
 #define EINA_LIST_H_
 
+#include <stdlib.h>
+
 #include "eina_config.h"
 
 #include "eina_types.h"
diff --git a/legacy/eina/src/include/eina_log.h b/legacy/eina/src/include/eina_log.h
index 9cd6152600..8b001485ea 100644
--- a/legacy/eina/src/include/eina_log.h
+++ b/legacy/eina/src/include/eina_log.h
@@ -19,6 +19,7 @@
 #ifndef EINA_LOG_H_
 #define EINA_LOG_H_
 
+#include <stdlib.h>
 #include <stdarg.h>
 #include <sys/types.h>
 
diff --git a/legacy/eina/src/include/eina_matrixsparse.h b/legacy/eina/src/include/eina_matrixsparse.h
index 231282206e..97d1ca5b38 100644
--- a/legacy/eina/src/include/eina_matrixsparse.h
+++ b/legacy/eina/src/include/eina_matrixsparse.h
@@ -19,6 +19,8 @@
 #ifndef EINA_MATRIXSPARSE_H_
 #define EINA_MATRIXSPARSE_H_
 
+#include <stdlib.h>
+
 #include "eina_config.h"
 
 #include "eina_types.h"
diff --git a/legacy/eina/src/include/eina_rbtree.h b/legacy/eina/src/include/eina_rbtree.h
index d275589837..8e5b7303f0 100644
--- a/legacy/eina/src/include/eina_rbtree.h
+++ b/legacy/eina/src/include/eina_rbtree.h
@@ -19,6 +19,8 @@
 #ifndef EINA_RBTREE_H__
 #define EINA_RBTREE_H__
 
+#include <stdlib.h>
+
 #include "eina_types.h"
 #include "eina_error.h"
 #include "eina_iterator.h"
diff --git a/legacy/eina/src/include/eina_str.h b/legacy/eina/src/include/eina_str.h
index db2895f5a8..32c1cc66ab 100644
--- a/legacy/eina/src/include/eina_str.h
+++ b/legacy/eina/src/include/eina_str.h
@@ -2,6 +2,7 @@
 #define _EINA_STR_H
 
 #include <stddef.h>
+#include <string.h>
 
 #include "eina_types.h"
 
diff --git a/legacy/eina/src/include/eina_unicode.h b/legacy/eina/src/include/eina_unicode.h
index 511520bc9e..aed59af9cf 100644
--- a/legacy/eina/src/include/eina_unicode.h
+++ b/legacy/eina/src/include/eina_unicode.h
@@ -1,6 +1,8 @@
 #ifndef EINA_UNICODE_H
 #define EINA_UNICODE_H
 
+#include <stdlib.h>
+
 #include "eina_config.h"
 #include "eina_types.h"