This is a follow-up to 535c3ce632.
That commit made glfw3native.h undefine GLAPIENTRY whenever
GLFW_EXPOSE_NATIVE_GLX or GLFW_EXPOSE_NATIVE_OSMESA was defined, on the
assumption that it was glfw3.h that had defined GLAPIENTRY.
If gl.h or an extension loader header has been included before glfw3.h,
then it has defined inclusion guards preventing GLAPIENTRY from being
defined later when the GLX or OSMesa header includes gl.h.
This commit ensures GLAPIENTRY is only undefined if glfw3.h defined it.
Related to #2010
			
			
				master
			
			
		
							parent
							
								
									5c3ebfb9cc
								
							
						
					
					
						commit
						ce85c7dcaf
					
				
				 2 changed files with 9 additions and 2 deletions
			
			
		
					Loading…
					
					
				
		Reference in New Issue