From c542bd114090753f5fc6f55e68605e1fd3bbd070 Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Mon, 10 Nov 2014 15:06:56 -0500 Subject: repair undef None GLX wrapper, pass 0 instead of None to GLX functions --- platform/default/headless_display.cpp | 2 +- platform/default/headless_view.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'platform') diff --git a/platform/default/headless_display.cpp b/platform/default/headless_display.cpp index 409fcbf057..ada48b8648 100644 --- a/platform/default/headless_display.cpp +++ b/platform/default/headless_display.cpp @@ -48,7 +48,7 @@ HeadlessDisplay::HeadlessDisplay() { // We're creating a dummy pbuffer anyway that we're not using. static int pixelFormat[] = { GLX_DRAWABLE_TYPE, GLX_PBUFFER_BIT, - None + 0 }; int configs = 0; diff --git a/platform/default/headless_view.cpp b/platform/default/headless_view.cpp index 687f3ecf7d..1f5a0ec987 100644 --- a/platform/default/headless_view.cpp +++ b/platform/default/headless_view.cpp @@ -107,7 +107,7 @@ GLXContext createCoreProfile(Display *dpy, GLXFBConfig fbconfig) { const int context_flags[] = { GLX_CONTEXT_MAJOR_VERSION_ARB, core_profile_versions[i].major, GLX_CONTEXT_MINOR_VERSION_ARB, core_profile_versions[i].minor, - None + 0 }; ctx = glXCreateContextAttribsARB(dpy, fbconfig, 0, True, context_flags); if (context_creation_failed) { @@ -172,7 +172,7 @@ void HeadlessView::createContext() { int pbuffer_attributes[] = { GLX_PBUFFER_WIDTH, 8, GLX_PBUFFER_HEIGHT, 8, - None + 0 }; glx_pbuffer = glXCreatePbuffer(x_display, fb_configs[0], pbuffer_attributes); #endif -- cgit v1.2.1