Merge branch 'master' into EGL

src/cocoa_native.m

@@ -41,7 +41,7 @@
 // Returns the X11 handle of the specified window
 //========================================================================
 
-GLFWAPI id glfwGetCocoaWindow(GLFWwindow window)
+GLFWAPI id glfwGetCocoaWindow(GLFWwindow handle)
 {
     _GLFWwindow* window = (_GLFWwindow*) handle;
 
@@ -59,7 +59,7 @@ GLFWAPI id glfwGetCocoaWindow(GLFWwindow window)
 // Return the GLX context of the specified window
 //========================================================================
 
-GLFWAPI id glfwGetNSGLContext(GLFWwindow window)
+GLFWAPI id glfwGetNSGLContext(GLFWwindow handle)
 {
     _GLFWwindow* window = (_GLFWwindow*) handle;
 

src/cocoa_window.m

@@ -1170,7 +1170,7 @@ void _glfwPlatformSetCursorPos(_GLFWwindow* window, int x, int y)
 {
     if (window->mode == GLFW_FULLSCREEN)
     {
-        NSPoint globalPoint = NSMakePoint(x, y);
+        CGPoint globalPoint = CGMakePoint(x, y);
         CGDisplayMoveCursorToPoint(CGMainDisplayID(), globalPoint);
     }
     else