From 6cc36e40f32baebae16a783bbac1ef0ac75bc1e0 Mon Sep 17 00:00:00 2001
From: caro <caro@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Date: Sat, 3 Apr 2010 05:29:44 +0000
Subject: [PATCH]  * update Visual Studio project files  * declare alloca in
 eet_connection.c  * remove the definition of __UNUSED__ (already done in
 config.h)  * reorganize a bit the inclusion of header files so that    the
 code is a bit more consistent

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/eet@47719 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---
 src/lib/eet_connection.c | 20 ++++++++++++++++----
 src/lib/eet_data.c       |  8 +-------
 src/lib/eet_image.c      | 10 +++++-----
 src/lib/eet_lib.c        |  8 ++++----
 win32/vs8/libeet.vcproj  |  4 ++++
 win32/vs9/libeet.vcproj  |  4 ++++
 6 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/src/lib/eet_connection.c b/src/lib/eet_connection.c
index ed90d75..99d1ff1 100644
--- a/src/lib/eet_connection.c
+++ b/src/lib/eet_connection.c
@@ -6,10 +6,21 @@
 # include <config.h>
 #endif
 
-#if HAVE___ATTRIBUTE__
-# define __UNUSED__ __attribute__((unused))
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+#elif defined __GNUC__
+# define alloca __builtin_alloca
+#elif defined _AIX
+# define alloca __alloca
+#elif defined _MSC_VER
+# include <malloc.h>
+# define alloca _alloca
 #else
-# define __UNUSED__
+# include <stddef.h>
+# ifdef  __cplusplus
+extern "C"
+# endif
+void *alloca (size_t);
 #endif
 
 #include <string.h>
@@ -19,9 +30,10 @@
 # include <netinet/in.h>
 #endif
 
-#if defined(_WIN32) && ! defined(__CEGCC__)
+#ifdef _WIN32
 # include <winsock2.h>
 #endif
+
 #include <Eina.h>
 
 #include "Eet.h"
diff --git a/src/lib/eet_data.c b/src/lib/eet_data.c
index d38deb8..cfc3121 100644
--- a/src/lib/eet_data.c
+++ b/src/lib/eet_data.c
@@ -6,12 +6,6 @@
 # include <config.h>
 #endif
 
-#if HAVE___ATTRIBUTE__
-# define __UNUSED__ __attribute__((unused))
-#else
-# define __UNUSED__
-#endif
-
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
@@ -22,7 +16,7 @@
 # include <netinet/in.h>
 #endif
 
-#if defined(_WIN32) && ! defined(__CEGCC__)
+#ifdef _WIN32
 # include <winsock2.h>
 #endif
 
diff --git a/src/lib/eet_image.c b/src/lib/eet_image.c
index 5adbb12..dc867ee 100644
--- a/src/lib/eet_image.c
+++ b/src/lib/eet_image.c
@@ -6,10 +6,6 @@
 # include <config.h>
 #endif
 
-#ifdef _WIN32
-# include <winsock2.h>
-#endif
-
 #ifdef HAVE_ALLOCA_H
 # include <alloca.h>
 #elif defined __GNUC__
@@ -36,9 +32,13 @@ void *alloca (size_t);
 
 #include <stdio.h>
 #include <string.h>
+#include <setjmp.h>
 #include <zlib.h>
 #include <jpeglib.h>
-#include <setjmp.h>
+
+#ifdef _WIN32
+# include <winsock2.h>
+#endif
 
 #include "Eet.h"
 #include "Eet_private.h"
diff --git a/src/lib/eet_lib.c b/src/lib/eet_lib.c
index cb89745..1508509 100644
--- a/src/lib/eet_lib.c
+++ b/src/lib/eet_lib.c
@@ -6,10 +6,6 @@
 # include <config.h>
 #endif
 
-#if defined(_WIN32) && ! defined(__CEGCC__)
-# include <winsock2.h>
-#endif
-
 #ifdef HAVE_ALLOCA_H
 # include <alloca.h>
 #elif defined __GNUC__
@@ -46,6 +42,10 @@ void *alloca (size_t);
 # include <netinet/in.h>
 #endif
 
+#ifdef _WIN32
+# include <winsock2.h>
+#endif
+
 #ifdef HAVE_EVIL
 # include <Evil.h>
 #endif
diff --git a/win32/vs8/libeet.vcproj b/win32/vs8/libeet.vcproj
index 91591a5..3afaaba 100644
--- a/win32/vs8/libeet.vcproj
+++ b/win32/vs8/libeet.vcproj
@@ -193,6 +193,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\src\lib\eet_connection.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\lib\eet_data.c"
 				>
 			</File>
diff --git a/win32/vs9/libeet.vcproj b/win32/vs9/libeet.vcproj
index d956f5e..e19c2fe 100644
--- a/win32/vs9/libeet.vcproj
+++ b/win32/vs9/libeet.vcproj
@@ -192,6 +192,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\src\lib\eet_connection.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\lib\eet_data.c"
 				>
 			</File>
-- 
2.7.4