8 files changed, 25 insertions, 9 deletions

diff --git a/configure.in b/configure.in
index d2014d9..71c86d1 100644
--- a/configure.in
+++ b/configure.in
@@ -63,7 +63,7 @@ AC_FUNC_STAT
 AC_CHECK_FUNCS(basename, , AC_CHECK_LIB(gen, basename, LIBS="-lgen $LIBS"))
 AC_CHECK_FUNCS(catclose catgets catopen getpid gettimeofday memset mkdir \
     nl_langinfo putenv regcomp select setenv setlocale sigaction snprintf \
-    sqrt strcasecmp strcasestr strchr strstr strtol strtoul vsnprintf)
+    sqrt strcasecmp strcasestr strchr strstr strtol strtoul sync vsnprintf)
 
 dnl The autoconf test for strftime is broken now (due to gcc 3.3 bug?):
 dnl Gcc 3.3 testprog = ``extern "C" char strftime;'', build with g++ test.cc
diff --git a/src/FbTk/I18n.cc b/src/FbTk/I18n.cc
index 81ff078..3daa2e9 100644
--- a/src/FbTk/I18n.cc
+++ b/src/FbTk/I18n.cc
@@ -72,17 +72,17 @@ void NLSInit(const char *catalog) {
 
 
 I18n::I18n():m_multibyte(false), m_utf8_translate(false), m_catalog_fd((nl_catd)(-1)) {
-#ifdef  HAVE_SETLOCALE
+#if defined(HAVE_SETLOCALE) && defined(NLS)
     //make sure we don't get 0 to m_locale string
     char *temp = setlocale(LC_MESSAGES, "");
     m_locale = ( temp ?  temp : "");
     if (m_locale.empty()) {
         cerr<<"Warning: Failed to set locale, reverting to \"C\""<<endl;
-#endif // HAVE_SETLOCALE
+#endif // defined(HAVE_SETLOCALE) && defined(NLS)
 
         m_locale = "C";
 
-#ifdef  HAVE_SETLOCALE
+#if defined(HAVE_SETLOCALE) && defined(NLS)
 
     } else {            
 
@@ -102,7 +102,7 @@ I18n::I18n():m_multibyte(false), m_utf8_translate(false), m_catalog_fd((nl_catd)
         if (index != string::npos) 
             m_locale.erase(0,index+1); //erase all characters starting up to index 
     }
-#endif // HAVE_SETLOCALE
+#endif // defined(HAVE_SETLOCALE) && defined(NLS)
 }
 
 
diff --git a/src/FbTk/SignalHandler.cc b/src/FbTk/SignalHandler.cc
index a0a4c4c..5f06210 100644
--- a/src/FbTk/SignalHandler.cc
+++ b/src/FbTk/SignalHandler.cc
@@ -46,6 +46,7 @@ bool SignalHandler::registerHandler(int signum, SignalEventHandler *eh,
     if (oldhandler_ret != 0)
         *oldhandler_ret = s_signal_handler[signum];
 
+#ifdef HAVE_SIGACTION
     struct sigaction sa;
     // set callback
     sa.sa_handler = SignalHandler::handleSignal;
@@ -54,7 +55,12 @@ bool SignalHandler::registerHandler(int signum, SignalEventHandler *eh,
 
     if (sigaction(signum, &sa, 0) == -1)
         return false;
-
+#else
+    // Fallback code for Windows and other platforms lacking sigaction.
+    if (signal(signum, &SignalHandler::handleSignal) == SIG_ERR) {
+        return false;
+    }
+#endif
     s_signal_handler[signum] = eh;
 
     return true;
diff --git a/src/FbTk/StringUtil.cc b/src/FbTk/StringUtil.cc
index 0a7ebd3..f76a1f9 100644
--- a/src/FbTk/StringUtil.cc
+++ b/src/FbTk/StringUtil.cc
@@ -176,7 +176,7 @@ string expandFilename(const string &filename) {
     size_t pos = filename.find_first_not_of(" \t");
     if (pos != string::npos && filename[pos] == '~') {
         retval = getenv("HOME");
-        if (pos != filename.size()) {
+        if (pos + 1 < filename.size()) {
             // copy from the character after '~'
             retval += static_cast<const char *>(filename.c_str() + pos + 1);
         }
diff --git a/src/FbTk/Timer.cc b/src/FbTk/Timer.cc
index 9b3fe8c..4d9f54f 100644
--- a/src/FbTk/Timer.cc
+++ b/src/FbTk/Timer.cc
@@ -49,7 +49,9 @@
 #  include <string.h>
 #endif
 
-#include <sys/select.h>
+#ifdef HAVE_SYS_SELECT_H
+#  include <sys/select.h>
+#endif
 
 namespace FbTk {
 
diff --git a/src/RootTheme.cc b/src/RootTheme.cc
index d303834..a2aa4a8 100644
--- a/src/RootTheme.cc
+++ b/src/RootTheme.cc
@@ -40,7 +40,10 @@
 #include <iostream>
 
 #include <sys/types.h>
+#ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
+#endif
+
 #ifdef HAVE_CSTRING
   #include <cstring>
 #else
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 2e5e373..ff44e9f 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -124,7 +124,9 @@
 #include <sys/stat.h>
 #endif // HAVE_SYS_STAT_H
 
+#ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
+#endif // HAVE_SYS_WAIT_H
 
 #include <iostream>
 #include <memory>
diff --git a/src/main.cc b/src/main.cc
index 1e80c4b..7541a28 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -374,10 +374,11 @@ void setupConfigFiles(const std::string& dirname, const std::string& rc) {
             sync_fs = true;
         }
     }
-
+#ifdef HAVE_SYNC
     if (sync_fs) {
        sync();
     }
+#endif
 }
 
 
@@ -414,7 +415,9 @@ void updateConfigFilesIfNeeded(const std::string& rc_file) {
                 << commandargs
                 << "' failed." << endl;
         }
+#ifdef HAVE_SYNC
         sync();
+#endif // HAVE_SYNC
     }
 }