From 94e9b3adff91a153faf0c86b436cdb7a7fa7e2fd Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Wed, 12 Dec 2012 13:59:53 +0100 Subject: [PATCH 1/2] Added include required for free. --- src/win32_joystick.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/win32_joystick.c b/src/win32_joystick.c index a9fe04b1..2b08d5f0 100644 --- a/src/win32_joystick.c +++ b/src/win32_joystick.c @@ -30,6 +30,8 @@ #include "internal.h" +#include + ////////////////////////////////////////////////////////////////////////// ////// GLFW internal API ////// From 37904dc68a27e47eea2c1133ada0f24135b556b1 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Wed, 12 Dec 2012 16:05:45 +0100 Subject: [PATCH 2/2] Documentation work. --- include/GL/glfw3.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/GL/glfw3.h b/include/GL/glfw3.h index 298c3d56..df7fa0a8 100644 --- a/include/GL/glfw3.h +++ b/include/GL/glfw3.h @@ -519,7 +519,8 @@ extern "C" { /*! @brief @c GL_TRUE for stereo rendering, or @c GL_FALSE otherwise. */ #define GLFW_STEREO 0x0002100C -/*! @brief The number of samples used for default framebuffer multisampling. +/*! @brief The number of samples used for default framebuffer multisampling, or + * zero to disable multisampling. */ #define GLFW_FSAA_SAMPLES 0x0002100E /*! @brief @c GL_TRUE if the framebuffer should be sRGB capable, or @c GL_FALSE @@ -1046,10 +1047,12 @@ GLFWAPI void glfwDefaultWindowHints(void); * available. * * The @ref GLFW_OPENGL_FORWARD_COMPAT hint specifies whether the OpenGL - * context should be forward-compatible. + * context should be forward-compatible, i.e. one where all functionality + * deprecated in the requested version of OpenGL is removed. * * The @ref GLFW_OPENGL_DEBUG_CONTEXT hint specifies whether to create a debug - * OpenGL context. + * OpenGL context, which may have additional error and performance issue + * reporting functionality. * * The @ref GLFW_OPENGL_PROFILE hint specifies which OpenGL profile to create * the context for. Possible values are @ref GLFW_OPENGL_NO_PROFILE, @ref