mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-10 09:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaced GLFWGLOBAL and _init_c_ with extern.

Browse Source
This commit is contained in:
Camilla Berglund 2012-08-26 18:42:15 +02:00
parent 1839c1c73d
commit 5d52ad1548
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/init.c
View File

@ -28,13 +28,29 @@
// //
//======================================================================== //========================================================================
#define _init_c_
#include "internal.h" #include "internal.h"
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
//////////////////////////////////////////////////////////////////////////
////// GLFW internal API //////
//////////////////////////////////////////////////////////////////////////
//========================================================================
// Platform independent global state shared between compilation units
//========================================================================
// Flag indicating whether GLFW has been initialized
GLboolean _glfwInitialized = GL_FALSE;
// All global data protected by _glfwInitialized
// This data should only be touched after a call to glfwInit that has
// not been followed by a call to glfwTerminate
_GLFWlibrary _glfwLibrary;
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
////// GLFW public API ////// ////// GLFW public API //////
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////

23
src/internal.h
View File

@ -31,17 +31,6 @@
#ifndef _internal_h_ #ifndef _internal_h_
#define _internal_h_ #define _internal_h_
//========================================================================
// GLFWGLOBAL is a macro that places all global variables in the init.c
// module (all other modules reference global variables as 'extern')
//========================================================================
#if defined(_init_c_)
#define GLFWGLOBAL
#else
#define GLFWGLOBAL extern
#endif
//======================================================================== //========================================================================
// Input handling definitions // Input handling definitions
@ -245,17 +234,15 @@ struct _GLFWlibrary
//======================================================================== //========================================================================
// System independent global variables (GLFW internals) // Platform independent global state shared between compilation units
// These are exported from init.c
//======================================================================== //========================================================================
// Flag indicating if GLFW has been initialized // Flag indicating if GLFW has been initialized
#if defined(_init_c_) extern GLboolean _glfwInitialized;
GLboolean _glfwInitialized = GL_FALSE;
#else
GLFWGLOBAL GLboolean _glfwInitialized;
#endif
GLFWGLOBAL _GLFWlibrary _glfwLibrary; // All global data protected by _glfwInitialized
extern _GLFWlibrary _glfwLibrary;
//======================================================================== //========================================================================