Browse Source

Fix build after latest commit

Closes #532
tags/1.9.8
falkTX 8 years ago
parent
commit
2eec0cb8b1
2 changed files with 5 additions and 1 deletions
  1. +4
    -0
      source/modules/dgl/src/pugl/pugl_x11.c
  2. +1
    -1
      source/modules/water/common.hpp

+ 4
- 0
source/modules/dgl/src/pugl/pugl_x11.c View File

@@ -341,7 +341,9 @@ puglDestroy(PuglView* view)
return; return;
} }


#ifndef DGL_FILE_BROWSER_DISABLED
x_fib_close(view->impl->display); x_fib_close(view->impl->display);
#endif


destroyContext(view); destroyContext(view);
XDestroyWindow(view->impl->display, view->impl->win); XDestroyWindow(view->impl->display, view->impl->win);
@@ -479,6 +481,7 @@ puglProcessEvents(PuglView* view)
while (XPending(view->impl->display) > 0) { while (XPending(view->impl->display) > 0) {
XNextEvent(view->impl->display, &event); XNextEvent(view->impl->display, &event);


#ifndef DGL_FILE_BROWSER_DISABLED
if (x_fib_handle_events(view->impl->display, &event)) { if (x_fib_handle_events(view->impl->display, &event)) {
const int status = x_fib_status(); const int status = x_fib_status();


@@ -497,6 +500,7 @@ puglProcessEvents(PuglView* view)
} }
break; break;
} }
#endif


if (event.xany.window != view->impl->win && if (event.xany.window != view->impl->win &&
(view->parent == 0 || event.xany.window != (Window)view->parent)) { (view->parent == 0 || event.xany.window != (Window)view->parent)) {


+ 1
- 1
source/modules/water/common.hpp View File

@@ -56,7 +56,7 @@ static inline
Result getResultForErrno() Result getResultForErrno()
{ {
#ifdef CARLA_PROPER_CPP11_SUPPORT #ifdef CARLA_PROPER_CPP11_SUPPORT
return Result::fail (String (std::strerror (std::errno)));
return Result::fail (String (std::strerror (errno)));
#else #else
return Result::fail (String (strerror (errno))); return Result::fail (String (strerror (errno)));
#endif #endif


Loading…
Cancel
Save