5 files changed, 29 insertions, 11 deletions

diff --git a/src/FbTk/App.cc b/src/FbTk/App.cc
index 8157839..f494a0e 100644
--- a/src/FbTk/App.cc
+++ b/src/FbTk/App.cc
@@ -60,8 +60,13 @@ App::App(const char *displayname):m_done(false), m_display(0) {
     if (displayname != 0 && displayname[0] == '\0')
         displayname = 0;
     m_display = XOpenDisplay(displayname);
-    if (!m_display)
-        throw std::string("Couldn't connect to XServer");
+    if (!m_display) {
+        if (displayname) {
+            throw std::string("Couldn't connect to XServer") + displayname;
+        } else {
+            throw std::string("Couldn't connect to XServer passing null display");
+        }
+    }
 
     FbStringUtil::init();
 }
diff --git a/src/FbTk/FileUtil.cc b/src/FbTk/FileUtil.cc
index 5de560b..c92b336 100644
--- a/src/FbTk/FileUtil.cc
+++ b/src/FbTk/FileUtil.cc
@@ -63,9 +63,14 @@ bool FileUtil::isExecutable(const char* filename) {
     if (!filename || stat(filename, &buf))
         return false;
 
-    return buf.st_mode & S_IXUSR || 
-           buf.st_mode & S_IXGRP ||
-           buf.st_mode & S_IXOTH;
+    return buf.st_mode & S_IXUSR
+#ifdef S_IXGRP
+        || buf.st_mode & S_IXGRP
+#endif
+#ifdef S_IXOTH
+        || buf.st_mode & S_IXOTH
+#endif
+    ;
 }
 
 bool FileUtil::copyFile(const char* from, const char* to) {
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/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 {