Merge branch 'master' of ssh://glfw.git.sourceforge.net/gitroot/glfw/glfw

include/GL/glfw3.h

@@ -154,6 +154,7 @@ extern "C" {
  * (which is not a nice solution for portable programs).
  */
 #if defined(__APPLE_CC__)
+ #define GL_GLEXT_LEGACY
  #include <OpenGL/gl.h>
  #ifndef GLFW_NO_GLU
   #include <OpenGL/glu.h>

src/cocoa/CMakeLists.txt

@@ -9,6 +9,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
 
 set(cocoa_SOURCES cocoa_enable.m
                   cocoa_fullscreen.m
+                  cocoa_gamma.m
                   cocoa_glext.m
                   cocoa_init.m
                   cocoa_joystick.m

src/cocoa/cocoa_gamma.m

@@ -0,0 +1,56 @@
+//========================================================================
+// GLFW - An OpenGL framework
+// Platform:    Cocoa/NSOpenGL
+// API version: 3.0
+// WWW:         http://www.glfw.org/
+//------------------------------------------------------------------------
+// Copyright (c) 2010 Camilla Berglund <elmindreda@elmindreda.org>
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//    claim that you wrote the original software. If you use this software
+//    in a product, an acknowledgment in the product documentation would
+//    be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such, and must not
+//    be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source
+//    distribution.
+//
+//========================================================================
+
+#include "internal.h"
+
+#include <limits.h>
+#include <string.h>
+
+
+//************************************************************************
+//****                  GLFW internal functions                       ****
+//************************************************************************
+
+//========================================================================
+// Save the original gamma ramp so that we can restore it later
+//========================================================================
+
+void _glfwPlatformGetGammaRamp(GLFWgammaramp* ramp)
+{
+}
+
+
+//========================================================================
+// Make the specified gamma ramp current
+//========================================================================
+
+void _glfwPlatformSetGammaRamp(const GLFWgammaramp* ramp)
+{
+}
+