[svn:parrot] r37239 - in trunk: . config/gen

japhb at svn.parrot.org japhb at svn.parrot.org
Mon Mar 9 12:32:35 UTC 2009


Author: japhb
Date: Mon Mar  9 12:32:35 2009
New Revision: 37239
URL: https://trac.parrot.org/parrot/changeset/37239

Log:
[OpenGL] Fix from ujwalic++ for OpenGL under MSVS

* Applied slightly modified patch from ujwalic:
  + fixed whitespace warnings
  + moved descriptive comment from code to commit message:
    "include parrot.h before glut.h on Win32 with MSVS
     to fix error C2381: 'exit' : redefinition; __declspec(noreturn)"
  + fix tested to work under Linux as well

Modified:
   trunk/CREDITS
   trunk/config/gen/opengl.pm

Modified: trunk/CREDITS
==============================================================================
--- trunk/CREDITS	Mon Mar  9 11:38:54 2009	(r37238)
+++ trunk/CREDITS	Mon Mar  9 12:32:35 2009	(r37239)
@@ -897,6 +897,11 @@
 N: Tony Payne
 D: Example hanoi.pasm
 
+N: Ujwal Reddy Malipeddi
+U: ujwalic
+E: ujwalic at gmail.com
+D: OpenGL/GLUT include file order with MSVS
+
 N: Uri Guttman
 D: Lot of general Parrot design hints
 

Modified: trunk/config/gen/opengl.pm
==============================================================================
--- trunk/config/gen/opengl.pm	Mon Mar  9 11:38:54 2009	(r37238)
+++ trunk/config/gen/opengl.pm	Mon Mar  9 12:32:35 2009	(r37239)
@@ -967,8 +967,8 @@
 
 #define PARROT_IN_EXTENSION
 
-#include <$glut_header>
 #include "parrot/parrot.h"
+#include <$glut_header>
 
 
 typedef enum {


More information about the parrot-commits mailing list