X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fpbd%2Fabstract_ui.h;h=5491210db7e951401cf69c43a79b21e95c9adb29;hb=22b07e0233a29d9633ffa825a79503befaf2e16e;hp=dc5620b2ef76354358862d03e8a1fcd594fb1c42;hpb=59076a7e4c66db12bbbfbf01f012ca2f6ba4bf56;p=ardour.git

diff --git a/libs/pbd/pbd/abstract_ui.h b/libs/pbd/pbd/abstract_ui.h
index dc5620b2ef..5491210db7 100644
--- a/libs/pbd/pbd/abstract_ui.h
+++ b/libs/pbd/pbd/abstract_ui.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 1998-2009 Paul Davis 
+    Copyright (C) 1998-2009 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@
 
 /* We have a special case in libpbd of a template class that gets instantiated
  * as the base class of several classes in other libraries. It is not possible
- * to use LIBFOO_API to mark this visible, because the FOO in each case is 
+ * to use LIBFOO_API to mark this visible, because the FOO in each case is
  * different. So we define this generic visible/export/hidden/import pair
  * of macros to try to deal with this special case. These should NEVER be
  * used anywhere except AbstractUI<T> (or similar cases if they arise.
@@ -46,7 +46,7 @@
 #define ABSTRACT_UI_API LIBPBD_DLL_EXPORT
 #else
 #define ABSTRACT_UI_API LIBPBD_DLL_IMPORT
-#endif 
+#endif
 
 
 class Touchable;
@@ -68,15 +68,14 @@ class ABSTRACT_UI_API AbstractUI : public BaseUI
 	struct RequestBuffer : public PBD::RingBufferNPT<RequestObject> {
                 bool dead;
                 AbstractUI<RequestObject>& ui;
-                RequestBuffer (uint32_t size, AbstractUI<RequestObject>& uir) 
+                RequestBuffer (uint32_t size, AbstractUI<RequestObject>& uir)
                         : PBD::RingBufferNPT<RequestObject> (size)
-                        , dead (false) 
+                        , dead (false)
                         , ui (uir) {}
         };
 	typedef typename RequestBuffer::rw_vector RequestBufferVector;
 
-#if defined(__MINGW32__) && !defined (__MINGW64__)
-
+#if defined(COMPILER_MINGW) && defined(PTW32_VERSION)
 	struct pthread_cmp
 	{
 		bool operator() (const ptw32_handle_t& thread1, const ptw32_handle_t& thread2)
@@ -93,10 +92,10 @@ class ABSTRACT_UI_API AbstractUI : public BaseUI
 
 	RequestBufferMap request_buffers;
         static Glib::Threads::Private<RequestBuffer> per_thread_request_buffer;
-	
+
 	Glib::Threads::Mutex               request_list_lock;
 	std::list<RequestObject*> request_list;
-	
+
 	RequestObject* get_request (RequestType);
 	void handle_ui_requests ();
 	void send_request (RequestObject *);