diff options
author | José Fonseca <[email protected]> | 2008-02-28 16:34:32 +0900 |
---|---|---|
committer | José Fonseca <[email protected]> | 2008-02-28 16:34:32 +0900 |
commit | 60159c1b09c73c19f798035a15d4ef3b434f2fa0 (patch) | |
tree | dc2afed450f50c071249a431e6bb7cd876d0bbf3 /src/glut/os2/glut_modifier.cpp | |
parent | 90a036b337fc41c25ee6ff89eb9422efd3d9f110 (diff) |
Convert crlf->lf line endings.
Windows/DOS users should enable core.autocrlf from now on:
git config --global core.autocrlf true
Diffstat (limited to 'src/glut/os2/glut_modifier.cpp')
-rw-r--r-- | src/glut/os2/glut_modifier.cpp | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/src/glut/os2/glut_modifier.cpp b/src/glut/os2/glut_modifier.cpp index 0ffa5a68010..7e0e67a21f2 100644 --- a/src/glut/os2/glut_modifier.cpp +++ b/src/glut/os2/glut_modifier.cpp @@ -1,31 +1,31 @@ -
-/* Copyright (c) Mark J. Kilgard, 1994. */
-
-/* This program is freely distributable without licensing fees
- and is provided without guarantee or warrantee expressed or
- implied. This program is -not- in the public domain. */
-
-#include "glutint.h"
-
-/* CENTRY */
-int GLUTAPIENTRY
-glutGetModifiers(void)
-{
- int modifiers;
-
- if(__glutModifierMask == (unsigned int) ~0) {
- __glutWarning(
- "glutCurrentModifiers: do not call outside core input callback.");
- return 0;
- }
- modifiers = 0;
- if(__glutModifierMask & (ShiftMask|LockMask))
- modifiers |= GLUT_ACTIVE_SHIFT;
- if(__glutModifierMask & ControlMask)
- modifiers |= GLUT_ACTIVE_CTRL;
- if(__glutModifierMask & Mod1Mask)
- modifiers |= GLUT_ACTIVE_ALT;
- return modifiers;
-}
-
-/* ENDCENTRY */
+ +/* Copyright (c) Mark J. Kilgard, 1994. */ + +/* This program is freely distributable without licensing fees + and is provided without guarantee or warrantee expressed or + implied. This program is -not- in the public domain. */ + +#include "glutint.h" + +/* CENTRY */ +int GLUTAPIENTRY +glutGetModifiers(void) +{ + int modifiers; + + if(__glutModifierMask == (unsigned int) ~0) { + __glutWarning( + "glutCurrentModifiers: do not call outside core input callback."); + return 0; + } + modifiers = 0; + if(__glutModifierMask & (ShiftMask|LockMask)) + modifiers |= GLUT_ACTIVE_SHIFT; + if(__glutModifierMask & ControlMask) + modifiers |= GLUT_ACTIVE_CTRL; + if(__glutModifierMask & Mod1Mask) + modifiers |= GLUT_ACTIVE_ALT; + return modifiers; +} + +/* ENDCENTRY */ |