Merge branch 'glfw_upstream' of https://github.com/Luflosi/kitty

This commit is contained in:
Kovid Goyal 2019-11-22 06:17:47 +05:30
commit db0cd61807
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C

View File

@ -271,7 +271,7 @@ bool _glfwCreateContextNSGL(_GLFWwindow* window,
return false; return false;
} }
NSOpenGLContext* share = NULL; NSOpenGLContext* share = nil;
if (ctxconfig->share) if (ctxconfig->share)
share = ctxconfig->share->context.nsgl.object; share = ctxconfig->share->context.nsgl.object;
@ -325,7 +325,7 @@ GLFWAPI id glfwGetNSGLContext(GLFWwindow* handle)
if (window->context.client == GLFW_NO_API) if (window->context.client == GLFW_NO_API)
{ {
_glfwInputError(GLFW_NO_WINDOW_CONTEXT, NULL); _glfwInputError(GLFW_NO_WINDOW_CONTEXT, NULL);
return NULL; return nil;
} }
return window->context.nsgl.object; return window->context.nsgl.object;