Merge pull request #193 from cen1/bsdfix

FreeBSD compilation error fixes
pvpgn · Nov 17, 2015 · cbca36a · cbca36a
2 parents 0b98e4f + 9b6f380
commit cbca36a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
@@ -16,6 +16,7 @@ include(CheckLibraryExists)
 include(CheckCXXCompilerFlag)
 include(CheckCXXSourceCompiles)
 include(CheckMkdirArgs)
+include(CheckIncludeFiles)
 
 # setup short variable path names
 set(BINDIR ${BIN_INSTALL_DIR})
@@ -113,9 +114,7 @@ message(STATUS "Checking optional POSIX/required SUS headers")
 check_include_file_cxx(sys/timeb.h HAVE_SYS_TIMEB_H)
 
 message(STATUS "Checking FreeBSD-based headers")
-if (HAVE_SYS_TYPES_H)
-check_include_file_cxx(sys/event.h HAVE_SYS_EVENT_H)
-endif()
+check_include_files("sys/types.h;sys/event.h" HAVE_SYS_EVENT_H)
 check_include_file_cxx(sys/param.h HAVE_SYS_PARAM_H)
 
 message(STATUS "Checking BSD headers")

diff --git a/src/common/fdwbackend.h b/src/common/fdwbackend.h
@@ -23,6 +23,7 @@
 #define __PVPGN_FDWBACKEND_INCLUDED__
 
 #include <stdexcept>
+#include <string>
 
 namespace pvpgn
 {
@@ -33,7 +34,7 @@ namespace pvpgn
 		class InitError :public std::runtime_error
 		{
 		public:
-			explicit InitError(const std::string& str = "")
+			explicit InitError(const std::string& str)
 				:std::runtime_error(str) {}
 			~InitError() throw() {}
 		};