Виправлено помилки компіляції на FreeBSD4

diff --git a/include/user_ips.h b/include/user_ips.h
index f160a31a04d028376a7b15c87a1bd2b993c11d80..250520b28f7eca14cc353020166f9d7ac0048956 100644 (file)
--- 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 36c50f5824efc345a2a16d6357878a1f6b679254..c147935dca519308d240ae3040c89cbc236a0693 100644 (file)
--- 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 dbca0f206bf269bbd79790ab39ee42cec870fbfe..361a4d2ac19820db48b28a031056df9be5e1a30f 100644 (file)
--- 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 b8d2b0e2184124fc6d5730f08778f421d3bbbcb8..3ad1eb5abbc50fbe56bb6e21ce2af35e07c9c421 100644 (file)
--- 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 7761d183ad8c71381d1df116b1ba0f071364be1b..6e9576983b5b95544a6f3ca2e40b9e18d5e39ca5 100644 (file)
--- 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 6b462ee05b4731e57672c0e38d451c83bfe780d5..f839f7c572aec722975fa0179d92a2da461a3c47 100644 (file)
--- 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 b82ae8182ec5bc903201fb2087646a9198d2f8a7..16bea3b17c43051eca2afdef057f9c1843f0686b 100644 (file)
--- 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;