Changeset 3083 for trunk/src/opengl/glut/glut_init.c

Timestamp:

Mar 11, 2000, 4:07:48 PM (25 years ago)

Author:

sandervl

Message:

compile fixes + cleanup

File:

• trunk/src/opengl/glut/glut_init.c (modified) (9 diffs)

trunk/src/opengl/glut/glut_init.c

@@ -1 @@
-/* $Id: glut_init.c,v 1.3 2000-03-04 19:10:15 jeroen Exp $ */
+/* $Id: glut_init.c,v 1.4 2000-03-11 15:07:45 sandervl Exp $ */
 /* Copyright (c) Mark J. Kilgard, 1994, 1997. */
 
@@ -17 +17 @@
 #if defined(__WIN32OS2__)
 #include <windows.h>
-#include "winconst.h"
 #include "GL\gl.h"
 #undef WH_NB_HOOKS /* Get rid of copiler warning... */
@@ -69 +68 @@
 {
   static char *classname;
-#if defined(__WIN32OS2__)
-  WNDCLASSA wc;
-  HINSTANCE hInstance = GetModuleHandleA(NULL);
-#else
   WNDCLASS  wc;
   HINSTANCE hInstance = GetModuleHandle(NULL);
-#endif
 
   /* Make sure we register the window only once. */
@@ -95 +89 @@
 
   /* Clear (important!) and then fill in the window class structure. */
-#if defined(__WIN32OS2__)
-  memset(&wc, 0, sizeof(WNDCLASSA));
-  wc.hIcon         = LoadIconA(hInstance, "GLUT_ICON");
-  wc.hCursor       = LoadCursorA(hInstance, IDC_ARROWA);
-#else
   memset(&wc, 0, sizeof(WNDCLASS));
   wc.hIcon         = LoadIcon(hInstance, "GLUT_ICON");
   wc.hCursor       = LoadCursor(hInstance, IDC_ARROW);
-#endif
 
   wc.lpfnWndProc   = (WNDPROC)__glutWindowProc;
@@ -114 +102 @@
   /* Fill in a default icon if one isn't specified as a resource. */
   if(!wc.hIcon)
-#if defined(__WIN32OS2__)
-    wc.hIcon = LoadIconA(NULL, MAKEINTRESOURCEA(IDI_WINLOGO_W));
-#else
     wc.hIcon = LoadIcon(NULL, IDI_WINLOGO);
-#endif
-
-#if defined(__WIN32OS2__)
-  if(!RegisterClassA(&wc)) {
-#else
+
   if(!RegisterClass(&wc)) {
-#endif
     __glutFatalError("RegisterClass() failed:"
                      "Cannot register GLUT window class.");
@@ -198 +178 @@
 }
 
-void APIENTRY
+void GLAPIENTRY
 glutInit(int *argcp, char **argv)
 {
-  dprintf(("GLUT32: glutInit()\n"));
-
   char *display = NULL;
   char *str, *geometry = NULL;
@@ -346 +324 @@
 
 /* CENTRY */
-void APIENTRY
+void GLAPIENTRY
 glutInitWindowPosition(int x, int y)
 {
@@ -360 +338 @@
 }
 
-void APIENTRY
+void GLAPIENTRY
 glutInitWindowSize(int width, int height)
 {
@@ -374 +352 @@
 }
 
-void APIENTRY
+void GLAPIENTRY
 glutInitDisplayMode(unsigned int mask)
 {