diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-10 17:11:10 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-10 17:11:10 -0500 |
commit | 658bb3ccd43658de18fbd43cd91a8e66650e27a7 (patch) | |
tree | 6a64705a20919b8d53b73601d0c3b4f4df6f5b15 /libs/pbd/pbd/abstract_ui.h | |
parent | 3020b224fa2d6e1b6b8a576e8e8e211e0585f2a2 (diff) | |
parent | b1231696caa7d08c80055ca59b18f4b634dc47cf (diff) |
finished merge of cairocanvas with windows and windows+cc branches
Diffstat (limited to 'libs/pbd/pbd/abstract_ui.h')
-rw-r--r-- | libs/pbd/pbd/abstract_ui.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/pbd/pbd/abstract_ui.h b/libs/pbd/pbd/abstract_ui.h index 1ceefe7b3b..dc5620b2ef 100644 --- a/libs/pbd/pbd/abstract_ui.h +++ b/libs/pbd/pbd/abstract_ui.h @@ -52,7 +52,7 @@ class Touchable; template<typename RequestObject> -class /*ABSTRACT_UI_API*/ AbstractUI : public BaseUI /* see notes in visibility.h about why this is not LIBPBD_API */ +class ABSTRACT_UI_API AbstractUI : public BaseUI { public: AbstractUI (const std::string& name); @@ -75,7 +75,7 @@ class /*ABSTRACT_UI_API*/ AbstractUI : public BaseUI /* see notes in visibility. }; typedef typename RequestBuffer::rw_vector RequestBufferVector; -#if defined(__MINGW32__) +#if defined(__MINGW32__) && !defined (__MINGW64__) struct pthread_cmp { |