removed a kwaak3 change that should not go back to the main branch

This commit is contained in:
Andy Chien 2013-04-19 11:53:22 -07:00
parent b03d7f8a4b
commit 3b6355fc97

View file

@ -166,41 +166,13 @@
#define __REGAL_H__
/* Skip OpenGL API if another header was included first. */
//#ifdef __gl_h_
//#pragma message("__gl_h already defined")
//#endif
//#ifdef __GL_H__
//#pragma message("__GL_H already defined")
//#endif
//#ifdef __X_GL_H
//#pragma message("__X_GL_H already defined")
//#endif
//#ifdef __gl2_h_
//#pragma message("__gl2_h already defined")
//#endif
//#ifdef __GLEXT_H_
//#pragma message("__GLEXT_H already defined")
//#endif
//#ifdef __gl_ATT_H_
//#pragma message("__gl_ATT_H_ already defined")
//#endif
//#ifdef _OPENGL_H
//#pragma message("_OPENGL_H already defined")
//#endif
//#if !defined(__gl_h_) && !defined(__GL_H__) && !defined(__X_GL_H) && !defined(__gl2_h_) && !defined(__glext_h_) && !defined(__GLEXT_H_) && !defined(__gl_ATI_h_) && !defined(_OPENGL_H)
// temporarily removed __glext_h_, kwaak3 is defining it to avoid glext.h to be
// included.
#if !defined(__gl_h_) && !defined(__GL_H__) && !defined(__X_GL_H) && !defined(__gl2_h_) && !defined(__GLEXT_H_) && !defined(__gl_ATI_h_) && !defined(_OPENGL_H)
#if !defined(__gl_h_) && !defined(__GL_H__) && !defined(__X_GL_H) && !defined(__gl2_h_) && !defined(__glext_h_) && !defined(__GLEXT_H_) && !defined(__gl_ATI_h_) && !defined(_OPENGL_H)
#define __gl_h_
#define __gl2_h_
#define __GL_H__
#define __X_GL_H
#ifndef __glext_h_
#define __glext_h_
#endif
#define __GLEXT_H_
#define __gl_ATI_h_
#define _OPENGL_H