From c483639ceee7b0658e2578c84e921a91a6e46d7e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Fri, 18 Mar 2011 19:04:15 +0000
Subject: [PATCH] Portability improvements.

---
 org.gridsite.core/src/gridsite-storage.c | 1 -
 org.gridsite.core/src/grst_admin_file.c  | 6 ++++++
 org.gridsite.core/src/grst_admin_main.c  | 6 ++++++
 org.gridsite.core/src/htcp.c             | 1 -
 org.gridsite.core/src/mod_gridsite.c     | 1 -
 org.gridsite.core/src/slashgrid.c        | 2 +-
 6 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/org.gridsite.core/src/gridsite-storage.c b/org.gridsite.core/src/gridsite-storage.c
index 9d076e9..54bbe47 100644
--- a/org.gridsite.core/src/gridsite-storage.c
+++ b/org.gridsite.core/src/gridsite-storage.c
@@ -45,7 +45,6 @@
 #include <stdlib.h>
 #include <getopt.h>
 #include <string.h>
-#include <malloc.h>
 #include <dirent.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/org.gridsite.core/src/grst_admin_file.c b/org.gridsite.core/src/grst_admin_file.c
index fff3cc4..6d95e8a 100644
--- a/org.gridsite.core/src/grst_admin_file.c
+++ b/org.gridsite.core/src/grst_admin_file.c
@@ -51,7 +51,13 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <fcntl.h>
 
 // when porting: remember that sendfile() is very OS-specific!
+#if defined(FREEBSD) || defined(__FreeBSD__) 
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+#else
 #include <sys/sendfile.h>
+#endif
 
 #include <gridsite.h>
 
diff --git a/org.gridsite.core/src/grst_admin_main.c b/org.gridsite.core/src/grst_admin_main.c
index 759dffa..d6bd981 100644
--- a/org.gridsite.core/src/grst_admin_main.c
+++ b/org.gridsite.core/src/grst_admin_main.c
@@ -55,7 +55,13 @@
 #include <fcntl.h>
 
 // when porting: remember that sendfile() is very OS-specific!
+#if defined(FREEBSD) || defined(__FreeBSD__) 
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+#else
 #include <sys/sendfile.h>
+#endif
 
 #include <gridsite.h>
 
diff --git a/org.gridsite.core/src/htcp.c b/org.gridsite.core/src/htcp.c
index e93fede..cbd9eb0 100644
--- a/org.gridsite.core/src/htcp.c
+++ b/org.gridsite.core/src/htcp.c
@@ -45,7 +45,6 @@
 #include <stdlib.h>
 #include <getopt.h>
 #include <string.h>
-#include <malloc.h>
 #include <dirent.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/org.gridsite.core/src/mod_gridsite.c b/org.gridsite.core/src/mod_gridsite.c
index 82c52f8..d9bf970 100644
--- a/org.gridsite.core/src/mod_gridsite.c
+++ b/org.gridsite.core/src/mod_gridsite.c
@@ -88,7 +88,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>              
 #include <netdb.h>
-#include <malloc.h>
 #include <stdlib.h>
 #include <string.h>
 #include <dirent.h>
diff --git a/org.gridsite.core/src/slashgrid.c b/org.gridsite.core/src/slashgrid.c
index 076ff76..0869b19 100644
--- a/org.gridsite.core/src/slashgrid.c
+++ b/org.gridsite.core/src/slashgrid.c
@@ -51,7 +51,7 @@
 #include <unistd.h>              
 #include <signal.h>
 #include <dirent.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <curl/curl.h>
 #include <pthread.h>
 #include <pwd.h>
-- 
1.8.2.3