diff options
author | José Fonseca <jrfonseca@tungstengraphics.com> | 2008-02-28 16:34:32 +0900 |
---|---|---|
committer | José Fonseca <jrfonseca@tungstengraphics.com> | 2008-02-28 16:34:32 +0900 |
commit | 60159c1b09c73c19f798035a15d4ef3b434f2fa0 (patch) | |
tree | dc2afed450f50c071249a431e6bb7cd876d0bbf3 /src/glut/os2/glutbitmap.h | |
parent | 90a036b337fc41c25ee6ff89eb9422efd3d9f110 (diff) | |
download | external_mesa3d-60159c1b09c73c19f798035a15d4ef3b434f2fa0.zip external_mesa3d-60159c1b09c73c19f798035a15d4ef3b434f2fa0.tar.gz external_mesa3d-60159c1b09c73c19f798035a15d4ef3b434f2fa0.tar.bz2 |
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/glutbitmap.h')
-rw-r--r-- | src/glut/os2/glutbitmap.h | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/src/glut/os2/glutbitmap.h b/src/glut/os2/glutbitmap.h index dc1b61a..9584bb1 100644 --- a/src/glut/os2/glutbitmap.h +++ b/src/glut/os2/glutbitmap.h @@ -1,32 +1,32 @@ -#ifndef __glutbitmap_h__
-#define __glutbitmap_h__
-
-/* Copyright (c) Mark J. Kilgard, 1994, 1998. */
-
-/* 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. */
-
-#define GLUT_NO_LIB_PRAGMA /* Avoid auto library linking when building
- the GLUT library itself. */
-#include <GL/glut.h>
-
-typedef struct {
- const GLsizei width;
- const GLsizei height;
- const GLfloat xorig;
- const GLfloat yorig;
- const GLfloat advance;
- const GLubyte *bitmap;
-} BitmapCharRec, *BitmapCharPtr;
-
-typedef struct {
- const char *name;
- const int num_chars;
- const int first;
- const BitmapCharRec * const *ch;
-} BitmapFontRec, *BitmapFontPtr;
-
-typedef void *GLUTbitmapFont;
-
-#endif /* __glutbitmap_h__ */
+#ifndef __glutbitmap_h__ +#define __glutbitmap_h__ + +/* Copyright (c) Mark J. Kilgard, 1994, 1998. */ + +/* 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. */ + +#define GLUT_NO_LIB_PRAGMA /* Avoid auto library linking when building + the GLUT library itself. */ +#include <GL/glut.h> + +typedef struct { + const GLsizei width; + const GLsizei height; + const GLfloat xorig; + const GLfloat yorig; + const GLfloat advance; + const GLubyte *bitmap; +} BitmapCharRec, *BitmapCharPtr; + +typedef struct { + const char *name; + const int num_chars; + const int first; + const BitmapCharRec * const *ch; +} BitmapFontRec, *BitmapFontPtr; + +typedef void *GLUTbitmapFont; + +#endif /* __glutbitmap_h__ */ |