Merge 45827 - Merged in fixes for GLEW compile errors on linux....

third_party/glew/include/GL/glxew.h

 /*
 ** The OpenGL Extension Wrangler Library
 ** Copyright (C) 2002-2008, Milan Ikits <milan ikits[]ieee org>
 ** Copyright (C) 2002-2008, Marcelo E. Magallon <mmagallo[]debian org>
 ** Copyright (C) 2002, Lev Povalahev
 ** All rights reserved.
 ** 
 ** Redistribution and use in source and binary forms, with or without 
 ** modification, are permitted provided that the following conditions are met:
 ** 
@@ skipping 65 matching lines @@
 ** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 */
 
 #ifndef __glxew_h__
 #define __glxew_h__
 #define __GLXEW_H__
 
 #ifdef __glxext_h_
 #error glxext.h included before glxew.h
 #endif
-#ifdef GLX_H
+
+#if defined(GLX_H) || defined(__GLX_glx_h__) || defined(__glx_h__)
 #error glx.h included before glxew.h
 #endif
 
 #define __glxext_h_
+
+#define GLX_H
 #define __GLX_glx_h__
-#define GLX_H
+#define __glx_h__
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xmd.h>
 #include <GL/glew.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
@@ skipping 1332 matching lines @@
 
 #endif /* GLEW_MX */
 
 extern GLboolean glxewGetExtension (Display* dpy, const char* name);
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif /* __glxew_h__ */