From 56ffdca636bfde338300a1ef6e0114ae1fc0373b Mon Sep 17 00:00:00 2001
From: Maxim Mamontov <faust.madf@gmail.com>
Date: Sat, 18 Dec 2010 23:03:05 +0200
Subject: [PATCH] =?utf8?q?=D0=92=D0=B8=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?utf8?q?=D0=BD=D0=BE=20=D0=BF=D0=BE=D0=BC=D0=B8=D0=BB=D0=BA=D0=B8=20?=
 =?utf8?q?=D0=BA=D0=BE=D0=BC=D0=BF=D1=96=D0=BB=D1=8F=D1=86=D1=96=D1=97=20?=
 =?utf8?q?=D0=BD=D0=B0=20FreeBSD4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 include/user_ips.h                                | 15 +++++++++------
 .../stargazer/plugins/store/files/file_store.cpp  |  1 -
 .../stargazer/plugins/store/files/file_store.h    |  1 +
 stglibs/common.lib/common.cpp                     |  4 ++++
 stglibs/common.lib/common.h                       |  4 ++++
 stglibs/conffiles.lib/conffiles.cpp               |  1 +
 stglibs/dotconfpp.lib/dotconfpp.cpp               |  2 ++
 7 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/include/user_ips.h b/include/user_ips.h
index f160a31a..250520b2 100644
--- a/include/user_ips.h
+++ b/include/user_ips.h
@@ -27,16 +27,19 @@
 #ifndef USER_IPS_H
 #define USER_IPS_H
 
+#ifdef FREE_BSD
+#include <sys/types.h>
+#endif
+
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include <cstring>
 #include <vector>
-//#include <algorithm>
 #include <string>
 #include <iostream>
 #include <sstream>
-#include <cstring>
-/////////////////////////
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 
 #include "common.h"
 #include "os_int.h"
diff --git a/projects/stargazer/plugins/store/files/file_store.cpp b/projects/stargazer/plugins/store/files/file_store.cpp
index 36c50f58..c147935d 100644
--- a/projects/stargazer/plugins/store/files/file_store.cpp
+++ b/projects/stargazer/plugins/store/files/file_store.cpp
@@ -30,7 +30,6 @@
 
 #include <pwd.h>
 #include <grp.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <sys/time.h>
diff --git a/projects/stargazer/plugins/store/files/file_store.h b/projects/stargazer/plugins/store/files/file_store.h
index dbca0f20..361a4d2a 100644
--- a/projects/stargazer/plugins/store/files/file_store.h
+++ b/projects/stargazer/plugins/store/files/file_store.h
@@ -29,6 +29,7 @@
 #define FILE_STORE_H
 
 #include <sys/types.h>
+#include <pthread.h>
 
 #include <string>
 
diff --git a/stglibs/common.lib/common.cpp b/stglibs/common.lib/common.cpp
index b8d2b0e2..3ad1eb5a 100644
--- a/stglibs/common.lib/common.cpp
+++ b/stglibs/common.lib/common.cpp
@@ -54,6 +54,10 @@
 #include <sys/socket.h>
 #endif*/
 
+#ifdef FREE_BSD
+#include <sys/types.h>
+#endif
+
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/stglibs/common.lib/common.h b/stglibs/common.lib/common.h
index 7761d183..6e957698 100644
--- a/stglibs/common.lib/common.h
+++ b/stglibs/common.lib/common.h
@@ -27,7 +27,11 @@
 #ifndef common_h
 #define common_h
 
+#ifdef __BORLANDC__
+#include <time.h>
+#else
 #include <ctime>
+#endif
 #include <string>
 
 #include "os_int.h"
diff --git a/stglibs/conffiles.lib/conffiles.cpp b/stglibs/conffiles.lib/conffiles.cpp
index 6b462ee0..f839f7c5 100644
--- a/stglibs/conffiles.lib/conffiles.cpp
+++ b/stglibs/conffiles.lib/conffiles.cpp
@@ -36,6 +36,7 @@
 #include <cerrno> // E*
 #include <cstring>
 #include <cstdlib>
+#include <cstdio>
 
 #include <fstream>
 
diff --git a/stglibs/dotconfpp.lib/dotconfpp.cpp b/stglibs/dotconfpp.lib/dotconfpp.cpp
index b82ae818..16bea3b1 100644
--- a/stglibs/dotconfpp.lib/dotconfpp.cpp
+++ b/stglibs/dotconfpp.lib/dotconfpp.cpp
@@ -397,6 +397,7 @@ int DOTCONFDocument::setContent(const char * _fileName)
                             case GLOB_NOSPACE:
                                 error(tagNode->lineNum, tagNode->fileName, "glob call failed for '%s': no free space", nodeFilePath.c_str());
                                 return -1;
+#ifndef FREE_BSD
                             case GLOB_ABORTED:
                                 // printf("Read error\n");
                                 // Ignore that error
@@ -405,6 +406,7 @@ int DOTCONFDocument::setContent(const char * _fileName)
                                 // printf("No match\n");
                                 // Ignore that error
                                 break;
+#endif
                             default:
                                 error(tagNode->lineNum, tagNode->fileName, "glob call failed for '%s': unknown error", nodeFilePath.c_str());
                                 return -1;
-- 
2.44.2