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

This commit is contained in:
Camilla Berglund 2010-10-04 19:36:11 +02:00
commit 4da3bf7827
2 changed files with 3 additions and 3 deletions

0
src/win32/platform.h Executable file → Normal file
View File

View File

@ -311,9 +311,9 @@ static _GLFWfbconfig* getFBConfigs(_GLFWwindow* window, unsigned int* found)
// Creates an OpenGL context on the specified device context // Creates an OpenGL context on the specified device context
//======================================================================== //========================================================================
static HGLRC createContext(_GLFWwindow* window, static GLboolean createContext(_GLFWwindow* window,
const _GLFWwndconfig* wndconfig, const _GLFWwndconfig* wndconfig,
int pixelFormat) int pixelFormat)
{ {
PIXELFORMATDESCRIPTOR pfd; PIXELFORMATDESCRIPTOR pfd;
int flags, i = 0, attribs[7]; int flags, i = 0, attribs[7];