From 828069087bf5c5a1d61a4ce29dee836ff3e1ea41 Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Thu, 13 Oct 2011 20:05:39 +0000
Subject: [PATCH] - removed un-necessary sendfile header - fixed compile when
 streflop disabled

---
 source/glest_game/graphics/renderer.cpp          | 16 ++++++++++++++++
 .../sources/feathery_ftp/ftpTargetPosix.c        |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/source/glest_game/graphics/renderer.cpp b/source/glest_game/graphics/renderer.cpp
index c08ce3499..f07cf8e93 100644
--- a/source/glest_game/graphics/renderer.cpp
+++ b/source/glest_game/graphics/renderer.cpp
@@ -867,16 +867,32 @@ static Vec2i _unprojectMap(const Vec2i& pt,const GLdouble* model,const GLdouble*
 
 	Vec2i pos;
 	if(strcmp(label,"tl") == 0) {
+#ifdef USE_STREFLOP
 		pos = Vec2i(streflop::floor(i.x),streflop::floor(i.z));
+#else
+		pos = Vec2i(floor(i.x),floor(i.z));
+#endif
 	}
 	else if(strcmp(label,"tr") == 0) {
+#ifdef USE_STREFLOP
 		pos = Vec2i(streflop::ceil(i.x),streflop::floor(i.z));
+#else
+		pos = Vec2i(ceil(i.x),floor(i.z));
+#endif
 	}
 	else if(strcmp(label,"bl") == 0) {
+#ifdef USE_STREFLOP
 		pos = Vec2i(streflop::floor(i.x),streflop::ceil(i.z));
+#else
+		pos = Vec2i(floor(i.x),ceil(i.z));
+#endif
 	}
 	else if(strcmp(label,"br") == 0) {
+#ifdef USE_STREFLOP
 		pos = Vec2i(streflop::ceil(i.x),streflop::ceil(i.z));
+#else
+		pos = Vec2i(ceil(i.x),ceil(i.z));
+#endif
 	}
 
 	if(false) { // print debug info
diff --git a/source/shared_lib/sources/feathery_ftp/ftpTargetPosix.c b/source/shared_lib/sources/feathery_ftp/ftpTargetPosix.c
index 8643edd10..932485167 100644
--- a/source/shared_lib/sources/feathery_ftp/ftpTargetPosix.c
+++ b/source/shared_lib/sources/feathery_ftp/ftpTargetPosix.c
@@ -30,7 +30,7 @@
 #if defined(__FreeBSD__)
     #include <sys/uio.h>
 #else
-    #include <sys/sendfile.h>
+    //#include <sys/sendfile.h>
 #endif
 
 #include <fcntl.h>