From 909ce772c039c72c40054446e9861e60279e94e2 Mon Sep 17 00:00:00 2001
From: "U-olece-PC\\olece" <eidheim@gmail.com>
Date: Tue, 1 Sep 2015 17:58:11 +0200
Subject: [PATCH] Now compiles on MSYS2 again.

---
 src/directories.cc     | 2 ++
 src/entrybox.cc        | 2 ++
 src/notebook.cc        | 2 ++
 src/selectiondialog.cc | 2 ++
 src/source.cc          | 2 ++
 src/tooltips.cc        | 2 ++
 src/window.cc          | 2 ++
 7 files changed, 14 insertions(+)

diff --git a/src/directories.cc b/src/directories.cc
index 00332cc..f114427 100644
--- a/src/directories.cc
+++ b/src/directories.cc
@@ -8,6 +8,7 @@
 #include <iostream> //TODO: remove
 using namespace std; //TODO: remove
 
+#ifndef _WIN32
 namespace sigc {
   template <typename Functor>
   struct functor_trait<Functor, false> {
@@ -17,6 +18,7 @@ namespace sigc {
     typedef Functor functor_type;
   };
 }
+#endif
 
 Directories::Directories() : stop_update_thread(false) {
   DEBUG("adding treeview to scrolledwindow");
diff --git a/src/entrybox.cc b/src/entrybox.cc
index df79ed4..20043bd 100644
--- a/src/entrybox.cc
+++ b/src/entrybox.cc
@@ -1,5 +1,6 @@
 #include "entrybox.h"
 
+#ifndef _WIN32
 namespace sigc {
   template <typename Functor>
   struct functor_trait<Functor, false> {
@@ -9,6 +10,7 @@ namespace sigc {
     typedef Functor functor_type;
   };
 }
+#endif
 
 std::unordered_map<std::string, std::vector<std::string> > EntryBox::entry_histories;
 
diff --git a/src/notebook.cc b/src/notebook.cc
index 4462d69..aea6ef1 100644
--- a/src/notebook.cc
+++ b/src/notebook.cc
@@ -9,6 +9,7 @@
 #include <iostream> //TODO: remove
 using namespace std; //TODO: remove
 
+#ifndef _WIN32
 namespace sigc {
   template <typename Functor>
   struct functor_trait<Functor, false> {
@@ -18,6 +19,7 @@ namespace sigc {
     typedef Functor functor_type;
   };
 }
+#endif
 
 Notebook::Notebook(Directories &directories) : Gtk::Notebook(), directories(directories) {
   Gsv::init();
diff --git a/src/selectiondialog.cc b/src/selectiondialog.cc
index 816041a..4cd0e5c 100644
--- a/src/selectiondialog.cc
+++ b/src/selectiondialog.cc
@@ -1,6 +1,7 @@
 #include "selectiondialog.h"
 #include <algorithm>
 
+#ifndef _WIN32
 namespace sigc {
   template <typename Functor>
   struct functor_trait<Functor, false> {
@@ -10,6 +11,7 @@ namespace sigc {
     typedef Functor functor_type;
   };
 }
+#endif
 
 SelectionDialogBase::SelectionDialogBase(Gtk::TextView& text_view, Glib::RefPtr<Gtk::TextBuffer::Mark> start_mark, bool show_search_entry): text_view(text_view), 
 start_mark(start_mark), show_search_entry(show_search_entry), list_view_text(1, false, Gtk::SelectionMode::SELECTION_BROWSE) {
diff --git a/src/source.cc b/src/source.cc
index 41d9fbf..fc330c4 100644
--- a/src/source.cc
+++ b/src/source.cc
@@ -11,6 +11,7 @@
 
 using namespace std; //TODO: remove
 
+#ifndef _WIN32
 namespace sigc {
   template <typename Functor>
   struct functor_trait<Functor, false> {
@@ -20,6 +21,7 @@ namespace sigc {
     typedef Functor functor_type;
   };
 }
+#endif
 
 Glib::RefPtr<Gsv::Language> Source::guess_language(const boost::filesystem::path &file_path) {
   auto language_manager=Gsv::LanguageManager::get_default();
diff --git a/src/tooltips.cc b/src/tooltips.cc
index 21696ef..a509c33 100644
--- a/src/tooltips.cc
+++ b/src/tooltips.cc
@@ -1,6 +1,7 @@
 #include "tooltips.h"
 #include "singletons.h"
 
+#ifndef _WIN32
 namespace sigc {
   template <typename Functor>
   struct functor_trait<Functor, false> {
@@ -10,6 +11,7 @@ namespace sigc {
     typedef Functor functor_type;
   };
 }
+#endif
 
 Gdk::Rectangle Tooltips::drawn_tooltips_rectangle=Gdk::Rectangle();
 
diff --git a/src/window.cc b/src/window.cc
index f831b51..402c294 100644
--- a/src/window.cc
+++ b/src/window.cc
@@ -9,6 +9,7 @@
 #include <iostream> //TODO: remove
 using namespace std; //TODO: remove
 
+#ifndef _WIN32
 namespace sigc {
   template <typename Functor>
   struct functor_trait<Functor, false> {
@@ -18,6 +19,7 @@ namespace sigc {
     typedef Functor functor_type;
   };
 }
+#endif
 
 void Window::generate_keybindings() {
   boost::filesystem::path path(Singleton::config_dir() + "menu.xml");