Convert crlf->lf line endings.

[mesa.git] / src / glut / os2 / glut_util.cpp

diff --git a/src/glut/os2/glut_util.cpp b/src/glut/os2/glut_util.cpp
index 76f25020affb3df8cebf0d65c6838db14a12199a..2a50a7400e4fce99b929b10af39445d46c42d68b 100644 (file)
--- a/src/glut/os2/glut_util.cpp
+++ b/src/glut/os2/glut_util.cpp
@@ -1,90 +1,90 @@
-\r
-/* Copyright (c) Mark J. Kilgard, 1994. */\r
-\r
-/* This program is freely distributable without licensing fees\r
-   and is provided without guarantee or warrantee expressed or\r
-   implied. This program is -not- in the public domain. */\r
-\r
-#include <stdlib.h>\r
-#include <stdarg.h>\r
-#include <string.h>\r
-#include <stdio.h>\r
-\r
-#include "glutint.h"\r
-\r
-#if !defined(__OS2__)\r
-\r
-/* strdup is actually not a standard ANSI C or POSIX routine\r
-   so implement a private one for GLUT.  OpenVMS does not have a\r
-   strdup; Linux's standard libc doesn't declare strdup by default\r
-   (unless BSD or SVID interfaces are requested). */\r
-char *\r
-__glutStrdup(const char *string)\r
-{\r
-  char *copy;\r
-\r
-  copy = (char*) malloc(strlen(string) + 1);\r
-  if (copy == NULL)\r
-    return NULL;\r
-  strcpy(copy, string);\r
-  return copy;\r
-}\r
-#endif\r
-\r
-void\r
-__glutWarning(char *format,...)\r
-{\r
-  va_list args;\r
-\r
-  va_start(args, format);\r
-  fprintf(stderr, "GLUT: Warning in %s: ",\r
-    __glutProgramName ? __glutProgramName : "(unamed)");\r
-  vfprintf(stderr, format, args);\r
-  va_end(args);\r
-  putc('\n', stderr);\r
-}\r
-\r
-/* CENTRY */\r
-void GLUTAPIENTRY\r
-glutReportErrors(void)\r
-{\r
-  GLenum error;\r
-\r
-  while ((error = glGetError()) != GL_NO_ERROR)\r
-    __glutWarning("GL error: %s", gluErrorString(error));\r
-}\r
-/* ENDCENTRY */\r
-\r
-void\r
-__glutFatalError(char *format,...)\r
-{\r
-  va_list args;\r
-\r
-  va_start(args, format);\r
-  fprintf(stderr, "GLUT: Fatal Error in %s: ",\r
-    __glutProgramName ? __glutProgramName : "(unamed)");\r
-  vfprintf(stderr, format, args);\r
-  va_end(args);\r
-  putc('\n', stderr);\r
-/*                   || defined(__OS2__) */\r
-#if defined(_WIN32)\r
-  if (__glutExitFunc) {\r
-    __glutExitFunc(1);\r
-  }\r
-#endif\r
-  exit(1);\r
-}\r
-\r
-void\r
-__glutFatalUsage(char *format,...)\r
-{\r
-  va_list args;\r
-\r
-  va_start(args, format);\r
-  fprintf(stderr, "GLUT: Fatal API Usage in %s: ",\r
-    __glutProgramName ? __glutProgramName : "(unamed)");\r
-  vfprintf(stderr, format, args);\r
-  va_end(args);\r
-  putc('\n', stderr);\r
-  abort();\r
-}\r
+
+/* 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 <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "glutint.h"
+
+#if !defined(__OS2__)
+
+/* strdup is actually not a standard ANSI C or POSIX routine
+   so implement a private one for GLUT.  OpenVMS does not have a
+   strdup; Linux's standard libc doesn't declare strdup by default
+   (unless BSD or SVID interfaces are requested). */
+char *
+__glutStrdup(const char *string)
+{
+  char *copy;
+
+  copy = (char*) malloc(strlen(string) + 1);
+  if (copy == NULL)
+    return NULL;
+  strcpy(copy, string);
+  return copy;
+}
+#endif
+
+void
+__glutWarning(char *format,...)
+{
+  va_list args;
+
+  va_start(args, format);
+  fprintf(stderr, "GLUT: Warning in %s: ",
+    __glutProgramName ? __glutProgramName : "(unamed)");
+  vfprintf(stderr, format, args);
+  va_end(args);
+  putc('\n', stderr);
+}
+
+/* CENTRY */
+void GLUTAPIENTRY
+glutReportErrors(void)
+{
+  GLenum error;
+
+  while ((error = glGetError()) != GL_NO_ERROR)
+    __glutWarning("GL error: %s", gluErrorString(error));
+}
+/* ENDCENTRY */
+
+void
+__glutFatalError(char *format,...)
+{
+  va_list args;
+
+  va_start(args, format);
+  fprintf(stderr, "GLUT: Fatal Error in %s: ",
+    __glutProgramName ? __glutProgramName : "(unamed)");
+  vfprintf(stderr, format, args);
+  va_end(args);
+  putc('\n', stderr);
+/*                   || defined(__OS2__) */
+#if defined(_WIN32)
+  if (__glutExitFunc) {
+    __glutExitFunc(1);
+  }
+#endif
+  exit(1);
+}
+
+void
+__glutFatalUsage(char *format,...)
+{
+  va_list args;
+
+  va_start(args, format);
+  fprintf(stderr, "GLUT: Fatal API Usage in %s: ",
+    __glutProgramName ? __glutProgramName : "(unamed)");
+  vfprintf(stderr, format, args);
+  va_end(args);
+  putc('\n', stderr);
+  abort();
+}