fixed some C errors

1 files changed, 121 insertions, 121 deletions

diff --git a/src/engine/external/glfw/include/GL/glfw.h b/src/engine/external/glfw/include/GL/glfw.h
index e5af4cc9..3770305f 100644
--- a/src/engine/external/glfw/include/GL/glfw.h
+++ b/src/engine/external/glfw/include/GL/glfw.h
@@ -1,31 +1,31 @@
-//========================================================================

-// GLFW - An OpenGL framework

-// File:        glfw.h

-// API version: 2.6

-// WWW:         http://glfw.sourceforge.net

-//------------------------------------------------------------------------

-// Copyright (c) 2002-2006 Camilla Berglund

-//

-// 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.

-//

-//========================================================================

+/*======================================================================== */
+/* GLFW - An OpenGL framework */
+/* File:        glfw.h */
+/* API version: 2.6 */
+/* WWW:         http://glfw.sourceforge.net */
+/*------------------------------------------------------------------------ */
+/* Copyright (c) 2002-2006 Camilla Berglund */
+/* */
+/* 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. */
+/* */
+/*======================================================================== */
 

 #ifndef __glfw_h_

 #define __glfw_h_

@@ -35,38 +35,38 @@ extern "C" {
 #endif

 

 

-//========================================================================

-// Global definitions

-//========================================================================

+/*======================================================================== */
+/* Global definitions */
+/*======================================================================== */
 

-// We need a NULL pointer from time to time

+/* We need a NULL pointer from time to time */
 #ifndef NULL

  #ifdef __cplusplus

   #define NULL 0

  #else

   #define NULL ((void *)0)

  #endif

-#endif // NULL

+#endif /* NULL */
 

 

-// ------------------- BEGIN SYSTEM/COMPILER SPECIFIC --------------------

+/* ------------------- BEGIN SYSTEM/COMPILER SPECIFIC -------------------- */
 

-// Please report any probles that you find with your compiler, which may

-// be solved in this section! There are several compilers that I have not

-// been able to test this file with yet.

+/* Please report any probles that you find with your compiler, which may */
+/* be solved in this section! There are several compilers that I have not */
+/* been able to test this file with yet. */
 

-// First: If we are we on Windows, we want a single define for it (_WIN32)

-// (Note: For Cygwin the compiler flag -mwin32 should be used, but to

-// make sure that things run smoothly for Cygwin users, we add __CYGWIN__

-// to the list of "valid Win32 identifiers", which removes the need for

-// -mwin32)

+/* First: If we are we on Windows, we want a single define for it (_WIN32) */
+/* (Note: For Cygwin the compiler flag -mwin32 should be used, but to */
+/* make sure that things run smoothly for Cygwin users, we add __CYGWIN__ */
+/* to the list of "valid Win32 identifiers", which removes the need for */
+/* -mwin32) */
 #if !defined(_WIN32) && (defined(__WIN32__) || defined(WIN32) || defined(__CYGWIN__))

  #define _WIN32

-#endif // _WIN32

+#endif /* _WIN32 */
 

-// In order for extension support to be portable, we need to define an

-// OpenGL function call method. We use the keyword APIENTRY, which is

-// defined for Win32. (Note: Windows also needs this for <GL/gl.h>)

+/* In order for extension support to be portable, we need to define an */
+/* OpenGL function call method. We use the keyword APIENTRY, which is */
+/* defined for Win32. (Note: Windows also needs this for <GL/gl.h>) */
 #ifndef APIENTRY

  #ifdef _WIN32

   #define APIENTRY __stdcall

@@ -74,63 +74,63 @@ extern "C" {
   #define APIENTRY

  #endif

  #define GL_APIENTRY_DEFINED

-#endif // APIENTRY

+#endif /* APIENTRY */
 

 

-// The following three defines are here solely to make some Windows-based

-// <GL/gl.h> files happy. Theoretically we could include <windows.h>, but

-// it has the major drawback of severely polluting our namespace.

+/* The following three defines are here solely to make some Windows-based */
+/* <GL/gl.h> files happy. Theoretically we could include <windows.h>, but */
+/* it has the major drawback of severely polluting our namespace. */
 

-// Under Windows, we need WINGDIAPI defined

+/* Under Windows, we need WINGDIAPI defined */
 #if !defined(WINGDIAPI) && defined(_WIN32)

  #if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__POCC__)

-  // Microsoft Visual C++, Borland C++ Builder and Pelles C

+  /* Microsoft Visual C++, Borland C++ Builder and Pelles C */
   #define WINGDIAPI __declspec(dllimport)

  #elif defined(__LCC__)

-  // LCC-Win32

+  /* LCC-Win32 */
   #define WINGDIAPI __stdcall

  #else

-  // Others (e.g. MinGW, Cygwin)

+  /* Others (e.g. MinGW, Cygwin) */
   #define WINGDIAPI extern

  #endif

  #define GL_WINGDIAPI_DEFINED

-#endif // WINGDIAPI

+#endif /* WINGDIAPI */
 

-// Some <GL/glu.h> files also need CALLBACK defined

+/* Some <GL/glu.h> files also need CALLBACK defined */
 #if !defined(CALLBACK) && defined(_WIN32)

  #if defined(_MSC_VER)

-  // Microsoft Visual C++

+  /* Microsoft Visual C++ */
   #if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_ALPHA) || defined(_M_PPC)) && !defined(MIDL_PASS)

    #define CALLBACK __stdcall

   #else

    #define CALLBACK

   #endif

  #else

-  // Other Windows compilers

+  /* Other Windows compilers */
   #define CALLBACK __stdcall

  #endif

  #define GLU_CALLBACK_DEFINED

-#endif // CALLBACK

+#endif /* CALLBACK */
 

-// Microsoft Visual C++, Borland C++ and Pelles C <GL/glu.h> needs wchar_t

+/* Microsoft Visual C++, Borland C++ and Pelles C <GL/glu.h> needs wchar_t */
 #if defined(_WIN32) && (defined(_MSC_VER) || defined(__BORLANDC__) || defined(__POCC__)) && !defined(_WCHAR_T_DEFINED)

  typedef unsigned short wchar_t;

  #define _WCHAR_T_DEFINED

-#endif // _WCHAR_T_DEFINED

+#endif /* _WCHAR_T_DEFINED */
 

 

-// ---------------- GLFW related system specific defines -----------------

+/* ---------------- GLFW related system specific defines ----------------- */
 

 #if defined(_WIN32) && defined(GLFW_BUILD_DLL)

 

- // We are building a Win32 DLL

+ /* We are building a Win32 DLL */
  #define GLFWAPI      __declspec(dllexport)

  #define GLFWAPIENTRY __stdcall

  #define GLFWCALL     __stdcall

 

 #elif defined(_WIN32) && defined(GLFW_DLL)

 

- // We are calling a Win32 DLL

+ /* We are calling a Win32 DLL */
  #if defined(__LCC__)

   #define GLFWAPI      extern

  #else

@@ -141,20 +141,20 @@ extern "C" {
 

 #else

 

- // We are either building/calling a static lib or we are non-win32

+ /* We are either building/calling a static lib or we are non-win32 */
  #define GLFWAPIENTRY

  #define GLFWAPI

  #define GLFWCALL

 

 #endif

 

-// -------------------- END SYSTEM/COMPILER SPECIFIC ---------------------

+/* -------------------- END SYSTEM/COMPILER SPECIFIC --------------------- */
 

-// Include standard OpenGL headers: GLFW uses GL_FALSE/GL_TRUE, and it is

-// convenient for the user to only have to include <GL/glfw.h>. This also

-// solves the problem with Windows <GL/gl.h> and <GL/glu.h> needing some

-// special defines which normally requires the user to include <windows.h>

-// (which is not a nice solution for portable programs).

+/* Include standard OpenGL headers: GLFW uses GL_FALSE/GL_TRUE, and it is */
+/* convenient for the user to only have to include <GL/glfw.h>. This also */
+/* solves the problem with Windows <GL/gl.h> and <GL/glu.h> needing some */
+/* special defines which normally requires the user to include <windows.h> */
+/* (which is not a nice solution for portable programs). */
 #if defined(__APPLE_CC__)

  #include <OpenGL/gl.h>

  #include <OpenGL/glu.h>

@@ -164,26 +164,26 @@ extern "C" {
 #endif

 

 

-//========================================================================

-// GLFW version

-//========================================================================

+/*======================================================================== */
+/* GLFW version */
+/*======================================================================== */
 

 #define GLFW_VERSION_MAJOR    2

 #define GLFW_VERSION_MINOR    6

 #define GLFW_VERSION_REVISION 0

 

 

-//========================================================================

-// Input handling definitions

-//========================================================================

+/*======================================================================== */
+/* Input handling definitions */
+/*======================================================================== */
 

-// Key and button state/action definitions

+/* Key and button state/action definitions */
 #define GLFW_RELEASE            0

 #define GLFW_PRESS              1

 

-// Keyboard key definitions: 8-bit ISO-8859-1 (Latin 1) encoding is used

-// for printable keys (such as A-Z, 0-9 etc), and values above 256

-// represent special (non-printable) keys (e.g. F1, Page Up etc).

+/* Keyboard key definitions: 8-bit ISO-8859-1 (Latin 1) encoding is used */
+/* for printable keys (such as A-Z, 0-9 etc), and values above 256 */
+/* represent special (non-printable) keys (e.g. F1, Page Up etc). */
 #define GLFW_KEY_UNKNOWN      -1

 #define GLFW_KEY_SPACE        32

 #define GLFW_KEY_SPECIAL      256

@@ -251,7 +251,7 @@ extern "C" {
 #define GLFW_KEY_KP_ENTER     (GLFW_KEY_SPECIAL+62)

 #define GLFW_KEY_LAST         GLFW_KEY_KP_ENTER

 

-// Mouse button definitions

+/* Mouse button definitions */
 #define GLFW_MOUSE_BUTTON_1      0

 #define GLFW_MOUSE_BUTTON_2      1

 #define GLFW_MOUSE_BUTTON_3      2

@@ -262,13 +262,13 @@ extern "C" {
 #define GLFW_MOUSE_BUTTON_8      7

 #define GLFW_MOUSE_BUTTON_LAST   GLFW_MOUSE_BUTTON_8

 

-// Mouse button aliases

+/* Mouse button aliases */
 #define GLFW_MOUSE_BUTTON_LEFT   GLFW_MOUSE_BUTTON_1

 #define GLFW_MOUSE_BUTTON_RIGHT  GLFW_MOUSE_BUTTON_2

 #define GLFW_MOUSE_BUTTON_MIDDLE GLFW_MOUSE_BUTTON_3

 

 

-// Joystick identifiers

+/* Joystick identifiers */
 #define GLFW_JOYSTICK_1          0

 #define GLFW_JOYSTICK_2          1

 #define GLFW_JOYSTICK_3          2

@@ -288,15 +288,15 @@ extern "C" {
 #define GLFW_JOYSTICK_LAST       GLFW_JOYSTICK_16

 

 

-//========================================================================

-// Other definitions

-//========================================================================

+/*======================================================================== */
+/* Other definitions */
+/*======================================================================== */
 

-// glfwOpenWindow modes

+/* glfwOpenWindow modes */
 #define GLFW_WINDOW               0x00010001

 #define GLFW_FULLSCREEN           0x00010002

 

-// glfwGetWindowParam tokens

+/* glfwGetWindowParam tokens */
 #define GLFW_OPENED               0x00020001

 #define GLFW_ACTIVE               0x00020002

 #define GLFW_ICONIFIED            0x00020003

@@ -308,8 +308,8 @@ extern "C" {
 #define GLFW_DEPTH_BITS           0x00020009

 #define GLFW_STENCIL_BITS         0x0002000A

 

-// The following constants are used for both glfwGetWindowParam

-// and glfwOpenWindowHint

+/* The following constants are used for both glfwGetWindowParam */
+/* and glfwOpenWindowHint */
 #define GLFW_REFRESH_RATE         0x0002000B

 #define GLFW_ACCUM_RED_BITS       0x0002000C

 #define GLFW_ACCUM_GREEN_BITS     0x0002000D

@@ -320,7 +320,7 @@ extern "C" {
 #define GLFW_WINDOW_NO_RESIZE     0x00020012

 #define GLFW_FSAA_SAMPLES         0x00020013

 

-// glfwEnable/glfwDisable tokens

+/* glfwEnable/glfwDisable tokens */
 #define GLFW_MOUSE_CURSOR         0x00030001

 #define GLFW_STICKY_KEYS          0x00030002

 #define GLFW_STICKY_MOUSE_BUTTONS 0x00030003

@@ -328,36 +328,36 @@ extern "C" {
 #define GLFW_KEY_REPEAT           0x00030005

 #define GLFW_AUTO_POLL_EVENTS     0x00030006

 

-// glfwWaitThread wait modes

+/* glfwWaitThread wait modes */
 #define GLFW_WAIT                 0x00040001

 #define GLFW_NOWAIT               0x00040002

 

-// glfwGetJoystickParam tokens

+/* glfwGetJoystickParam tokens */
 #define GLFW_PRESENT              0x00050001

 #define GLFW_AXES                 0x00050002

 #define GLFW_BUTTONS              0x00050003

 

-// glfwReadImage/glfwLoadTexture2D flags

-#define GLFW_NO_RESCALE_BIT       0x00000001 // Only for glfwReadImage

+/* glfwReadImage/glfwLoadTexture2D flags */
+#define GLFW_NO_RESCALE_BIT       0x00000001 /* Only for glfwReadImage */
 #define GLFW_ORIGIN_UL_BIT        0x00000002

-#define GLFW_BUILD_MIPMAPS_BIT    0x00000004 // Only for glfwLoadTexture2D

+#define GLFW_BUILD_MIPMAPS_BIT    0x00000004 /* Only for glfwLoadTexture2D */
 #define GLFW_ALPHA_MAP_BIT        0x00000008

 

-// Time spans longer than this (seconds) are considered to be infinity

+/* Time spans longer than this (seconds) are considered to be infinity */
 #define GLFW_INFINITY 100000.0

 

 

-//========================================================================

-// Typedefs

-//========================================================================

+/*======================================================================== */
+/* Typedefs */
+/*======================================================================== */
 

-// The video mode structure used by glfwGetVideoModes()

+/* The video mode structure used by glfwGetVideoModes() */
 typedef struct {

     int Width, Height;

     int RedBits, BlueBits, GreenBits;

 } GLFWvidmode;

 

-// Image/texture information

+/* Image/texture information */
 typedef struct {

     int Width, Height;

     int Format;

@@ -365,16 +365,16 @@ typedef struct {
     unsigned char *Data;

 } GLFWimage;

 

-// Thread ID

+/* Thread ID */
 typedef int GLFWthread;

 

-// Mutex object

+/* Mutex object */
 typedef void * GLFWmutex;

 

-// Condition variable object

+/* Condition variable object */
 typedef void * GLFWcond;

 

-// Function pointer types

+/* Function pointer types */
 typedef void (GLFWCALL * GLFWwindowsizefun)(int,int);

 typedef int  (GLFWCALL * GLFWwindowclosefun)(void);

 typedef void (GLFWCALL * GLFWwindowrefreshfun)(void);

@@ -386,20 +386,20 @@ typedef void (GLFWCALL * GLFWcharfun)(int,int);
 typedef void (GLFWCALL * GLFWthreadfun)(void *);

 

 

-//========================================================================

-// Prototypes

-//========================================================================

+/*======================================================================== */
+/* Prototypes */
+/*======================================================================== */
 

 /*! @file glfw.h

  */

-// GLFW initialization, termination and version querying

+/* GLFW initialization, termination and version querying */
 /*! @fn glfwInit

  */

 GLFWAPI int  GLFWAPIENTRY glfwInit( void );

 GLFWAPI void GLFWAPIENTRY glfwTerminate( void );

 GLFWAPI void GLFWAPIENTRY glfwGetVersion( int *major, int *minor, int *rev );

 

-// Window handling

+/* Window handling */
 GLFWAPI int  GLFWAPIENTRY glfwOpenWindow( int width, int height, int redbits, int greenbits, int bluebits, int alphabits, int depthbits, int stencilbits, int mode );

 GLFWAPI void GLFWAPIENTRY glfwOpenWindowHint( int target, int hint );

 GLFWAPI void GLFWAPIENTRY glfwCloseWindow( void );

@@ -416,11 +416,11 @@ GLFWAPI void GLFWAPIENTRY glfwSetWindowSizeCallback( GLFWwindowsizefun cbfun );
 GLFWAPI void GLFWAPIENTRY glfwSetWindowCloseCallback( GLFWwindowclosefun cbfun );

 GLFWAPI void GLFWAPIENTRY glfwSetWindowRefreshCallback( GLFWwindowrefreshfun cbfun );

 

-// Video mode functions

+/* Video mode functions */
 GLFWAPI int  GLFWAPIENTRY glfwGetVideoModes( GLFWvidmode *list, int maxcount );

 GLFWAPI void GLFWAPIENTRY glfwGetDesktopMode( GLFWvidmode *mode );

 

-// Input handling

+/* Input handling */
 GLFWAPI void GLFWAPIENTRY glfwPollEvents( void );

 GLFWAPI void GLFWAPIENTRY glfwWaitEvents( void );

 GLFWAPI int  GLFWAPIENTRY glfwGetKey( int key );

@@ -435,22 +435,22 @@ GLFWAPI void GLFWAPIENTRY glfwSetMouseButtonCallback( GLFWmousebuttonfun cbfun )
 GLFWAPI void GLFWAPIENTRY glfwSetMousePosCallback( GLFWmouseposfun cbfun );

 GLFWAPI void GLFWAPIENTRY glfwSetMouseWheelCallback( GLFWmousewheelfun cbfun );

 

-// Joystick input

+/* Joystick input */
 GLFWAPI int GLFWAPIENTRY glfwGetJoystickParam( int joy, int param );

 GLFWAPI int GLFWAPIENTRY glfwGetJoystickPos( int joy, float *pos, int numaxes );

 GLFWAPI int GLFWAPIENTRY glfwGetJoystickButtons( int joy, unsigned char *buttons, int numbuttons );

 

-// Time

+/* Time */
 GLFWAPI double GLFWAPIENTRY glfwGetTime( void );

 GLFWAPI void   GLFWAPIENTRY glfwSetTime( double time );

 GLFWAPI void   GLFWAPIENTRY glfwSleep( double time );

 

-// Extension support

+/* Extension support */
 GLFWAPI int   GLFWAPIENTRY glfwExtensionSupported( const char *extension );

 GLFWAPI void* GLFWAPIENTRY glfwGetProcAddress( const char *procname );

 GLFWAPI void  GLFWAPIENTRY glfwGetGLVersion( int *major, int *minor, int *rev );

 

-// Threading support

+/* Threading support */
 GLFWAPI GLFWthread GLFWAPIENTRY glfwCreateThread( GLFWthreadfun fun, void *arg );

 GLFWAPI void GLFWAPIENTRY glfwDestroyThread( GLFWthread ID );

 GLFWAPI int  GLFWAPIENTRY glfwWaitThread( GLFWthread ID, int waitmode );

@@ -466,11 +466,11 @@ GLFWAPI void GLFWAPIENTRY glfwSignalCond( GLFWcond cond );
 GLFWAPI void GLFWAPIENTRY glfwBroadcastCond( GLFWcond cond );

 GLFWAPI int  GLFWAPIENTRY glfwGetNumberOfProcessors( void );

 

-// Enable/disable functions

+/* Enable/disable functions */
 GLFWAPI void GLFWAPIENTRY glfwEnable( int token );

 GLFWAPI void GLFWAPIENTRY glfwDisable( int token );

 

-// Image/texture I/O support

+/* Image/texture I/O support */
 GLFWAPI int  GLFWAPIENTRY glfwReadImage( const char *name, GLFWimage *img, int flags );

 GLFWAPI int  GLFWAPIENTRY glfwReadMemoryImage( const void *data, long size, GLFWimage *img, int flags );

 GLFWAPI void GLFWAPIENTRY glfwFreeImage( GLFWimage *img );

@@ -483,4 +483,4 @@ GLFWAPI int  GLFWAPIENTRY glfwLoadTextureImage2D( GLFWimage *img, int flags );
 }

 #endif

 

-#endif // __glfw_h_

+#endif /* __glfw_h_ */