From 70b9a1f4f3ec081df7b1828091a59a17c44c2a83 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Mon, 25 Oct 2010 12:36:14 +0200 Subject: [PATCH] Made boolean values use GLboolean. --- src/cocoa/platform.h | 2 +- src/internal.h | 19 ++++++++++--------- src/win32/platform.h | 28 ++++++++++++++-------------- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/cocoa/platform.h b/src/cocoa/platform.h index b77241a9..2de2b52c 100644 --- a/src/cocoa/platform.h +++ b/src/cocoa/platform.h @@ -102,7 +102,7 @@ typedef struct _GLFWlibraryNS // dlopen handle for dynamically loading OpenGL extension entry points void* OpenGLFramework; - int unbundled; + GLboolean unbundled; id desktopMode; id delegate; id autoreleasePool; diff --git a/src/internal.h b/src/internal.h index b064ebb5..bcd7408f 100644 --- a/src/internal.h +++ b/src/internal.h @@ -87,13 +87,13 @@ struct _GLFWhints int accumBlueBits; int accumAlphaBits; int auxBuffers; - int stereo; - int windowNoResize; + GLboolean stereo; + GLboolean windowNoResize; int samples; int glMajor; int glMinor; - int glForward; - int glDebug; + GLboolean glForward; + GLboolean glDebug; int glProfile; }; @@ -109,11 +109,11 @@ struct _GLFWwndconfig int mode; const char* title; int refreshRate; - int windowNoResize; + GLboolean windowNoResize; int glMajor; int glMinor; - int glForward; - int glDebug; + GLboolean glForward; + GLboolean glDebug; int glProfile; _GLFWwindow* share; }; @@ -139,7 +139,7 @@ struct _GLFWfbconfig int accumBlueBits; int accumAlphaBits; int auxBuffers; - int stereo; + GLboolean stereo; int samples; GLFWintptr platformID; }; @@ -190,7 +190,8 @@ struct _GLFWwindow // OpenGL extensions and context attributes GLboolean accelerated; // GL_TRUE if OpenGL context is "accelerated" int glMajor, glMinor, glRevision; - int glForward, glDebug, glProfile; + GLboolean glForward, glDebug; + int glProfile; PFNGLGETSTRINGIPROC GetStringi; // These are defined in the current port's platform.h diff --git a/src/win32/platform.h b/src/win32/platform.h index 3ce580f2..fe75c2c8 100644 --- a/src/win32/platform.h +++ b/src/win32/platform.h @@ -256,7 +256,7 @@ typedef struct _GLFWwindowWin32 // Various platform specific internal variables int desiredRefreshRate; // Desired vertical monitor refresh rate - int mouseMoved; + GLboolean mouseMoved; int oldMouseX, oldMouseY; } _GLFWwindowWin32; @@ -266,26 +266,26 @@ typedef struct _GLFWwindowWin32 //------------------------------------------------------------------------ typedef struct _GLFWlibraryWin32 { - HINSTANCE instance; // Instance of the application - ATOM classAtom; // Window class atom - HHOOK keyboardHook; // Keyboard hook handle - DWORD foregroundLockTimeout; + HINSTANCE instance; // Instance of the application + ATOM classAtom; // Window class atom + HHOOK keyboardHook; // Keyboard hook handle + DWORD foregroundLockTimeout; // Default monitor struct { - int modeChanged; - int width; - int height; - int bitsPerPixel; - int refreshRate; + GLboolean modeChanged; + int width; + int height; + int bitsPerPixel; + int refreshRate; } monitor; // Timer data struct { - int hasPerformanceCounter; - double resolution; - unsigned int t0_32; - __int64 t0_64; + GLboolean hasPerformanceCounter; + double resolution; + unsigned int t0_32; + __int64 t0_64; } timer; #ifndef _GLFW_NO_DLOAD_GDI32