From aa56214d0bae66b0a2bda2d54ae7d8fce3a1d9a8 Mon Sep 17 00:00:00 2001
From: Vincent Torri <vincent.torri@gmail.com>
Date: Wed, 30 Sep 2009 17:29:30 +0000
Subject: [PATCH] Fix compilation on Windows wrt changes in fixed point code

SVN revision: 42822
---
 legacy/eina/src/lib/eina_convert.c   |  6 +++++-
 legacy/eina/win32/vs8/libeina.vcproj | 16 ++++------------
 legacy/eina/win32/vs9/libeina.vcproj | 16 ++++------------
 3 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/legacy/eina/src/lib/eina_convert.c b/legacy/eina/src/lib/eina_convert.c
index 175c9e7a63..e9831634c2 100644
--- a/legacy/eina/src/lib/eina_convert.c
+++ b/legacy/eina/src/lib/eina_convert.c
@@ -25,6 +25,10 @@
 #include <string.h>
 #include <stdio.h>
 
+#ifdef HAVE_EVIL
+# include <Evil.h>
+#endif
+
 #include "eina_config.h"
 #include "eina_private.h"
 #include "eina_log.h"
@@ -601,7 +605,7 @@ EAPI int
 eina_convert_fptoa(Eina_F32p32 fp, char *des)
 {
    int length = 0;
-   int p = 0;;
+   int p = 0;
    int i;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(des, EINA_FALSE);
diff --git a/legacy/eina/win32/vs8/libeina.vcproj b/legacy/eina/win32/vs8/libeina.vcproj
index 424c180705..5e8e392ce7 100644
--- a/legacy/eina/win32/vs8/libeina.vcproj
+++ b/legacy/eina/win32/vs8/libeina.vcproj
@@ -330,22 +330,14 @@
 				RelativePath="..\..\src\include\eina_error.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\include\eina_f8p24.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_f16p16.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_f32p32.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\include\eina_file.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\include\eina_fp.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\include\eina_hamster.h"
 				>
diff --git a/legacy/eina/win32/vs9/libeina.vcproj b/legacy/eina/win32/vs9/libeina.vcproj
index a55b09caf7..d33b9083df 100644
--- a/legacy/eina/win32/vs9/libeina.vcproj
+++ b/legacy/eina/win32/vs9/libeina.vcproj
@@ -341,22 +341,14 @@
 				RelativePath="..\..\src\include\eina_error.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\include\eina_f8p24.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_f16p16.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\include\eina_f32p32.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\include\eina_file.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\include\eina_fp.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\include\eina_hamster.h"
 				>