7 files changed, 10 insertions, 9 deletions
diff --git a/make/config/jogl/cgl-macosx.cfg b/make/config/jogl/cgl-macosx.cfg
index edb5bfbbf..a67ee8087 100644
--- a/make/config/jogl/cgl-macosx.cfg
+++ b/make/config/jogl/cgl-macosx.cfg
@@ -31,7 +31,7 @@ Opaque long NSOpenGLView *
 Opaque long NSOpenGLPixelBuffer *
 Opaque long NSOpenGLLayer *
 
-CustomCCode #include </usr/include/machine/types.h>
+CustomCCode #include <machine/types.h>
 CustomCCode #include "macosx-window-system.h"
 
 AccessControl createNSOpenGLLayerImpl PRIVATE
diff --git a/make/config/jogl/gl-headers.cfg b/make/config/jogl/gl-headers.cfg
index 073f9d9a0..0916fa348 100644
--- a/make/config/jogl/gl-headers.cfg
+++ b/make/config/jogl/gl-headers.cfg
@@ -20,7 +20,7 @@ CustomCCode   #include <inttypes.h>
 CustomCCode   #include <stdlib.h>
 CustomCCode   /* Include the OpenGL headers */
 CustomCCode   #include <GL/gl.h>
-CustomCCode   #include </usr/include/machine/types.h>
+CustomCCode   #include <machine/types.h>
 CustomCCode   /* Provide Windows typedefs */
 CustomCCode   typedef void* LPVOID;
 CustomCCode   typedef unsigned int* PUINT;
diff --git a/make/config/jogl/gl3-headers.cfg b/make/config/jogl/gl3-headers.cfg
index a4c5cf62a..d76d3ae4c 100644
--- a/make/config/jogl/gl3-headers.cfg
+++ b/make/config/jogl/gl3-headers.cfg
@@ -15,7 +15,7 @@ CustomCCode   #include <inttypes.h>
 CustomCCode   #include <stdlib.h>
 CustomCCode   #include <GL/glcorearb.h>
 CustomCCode   #include <GL/glcorearbext.h>
-CustomCCode   #include </usr/include/machine/types.h>
+CustomCCode   #include <machine/types.h>
 CustomCCode   /* Provide Windows typedefs */
 CustomCCode   typedef void* LPVOID;
 CustomCCode   typedef unsigned int* PUINT;
diff --git a/make/config/jogl/glu-gl2.cfg b/make/config/jogl/glu-gl2.cfg
index 491d9224f..a634e3113 100644
--- a/make/config/jogl/glu-gl2.cfg
+++ b/make/config/jogl/glu-gl2.cfg
@@ -18,7 +18,7 @@ CustomCCode   #include <stddef.h>
 CustomCCode #elif defined(__APPLE__)
 CustomCCode   #include <inttypes.h>
 CustomCCode   #include <jni.h>
-CustomCCode   #include </usr/include/machine/types.h>
+CustomCCode   #include <machine/types.h>
 CustomCCode #elif defined(__unix__)
 CustomCCode   #include <inttypes.h>
 CustomCCode #endif
diff --git a/make/config/nativewindow/jawt-macosx.cfg b/make/config/nativewindow/jawt-macosx.cfg
index 20260f693..5f6bbfd21 100644
--- a/make/config/nativewindow/jawt-macosx.cfg
+++ b/make/config/nativewindow/jawt-macosx.cfg
@@ -8,7 +8,7 @@ Opaque long NSView *
 Opaque long CALayer *
 
 CustomCCode #include <inttypes.h>
-CustomCCode #include </usr/include/machine/types.h>
+CustomCCode #include <machine/types.h>
 
 StructPackage JAWT_MacOSXDrawingSurfaceInfo jogamp.nativewindow.jawt.macosx
 EmitStruct JAWT_MacOSXDrawingSurfaceInfo
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index fd79b028e..3f4fe9c19 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -206,7 +206,7 @@ function jrun() {
     #D_ARGS="-Dnativewindow.debug.ToolkitLock"
     #D_ARGS="-Djogl.debug.graph.curve -Djogl.debug.GLSLCode -Djogl.debug.TraceGL"
     #D_ARGS="-Djogl.debug.graph.curve -Djogl.debug.GLSLState"
-    #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempJarCache -Djogamp.debug.JarUtil"
+    #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempJarCache -Djogamp.debug.JarUtil -Djogamp.debug.IOUtil"
     #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.TempJarCache -Djogamp.debug.JarUtil"
     #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.TempJarCache -Djogamp.debug.JarUtil -Djogamp.gluegen.UseTempJarCache=false"
     #D_ARGS="-Dnewt.test.EDTMainThread -Dnewt.debug.MainThread"
@@ -300,7 +300,7 @@ function testawtswt() {
 #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2GLJPanelsAWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasAWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestLandscapeES2NewtCanvasAWT $*
-testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestLandscapeES2NEWT $*
 #testawtswt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasSWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestElektronenMultipliziererNEWT $*
@@ -355,7 +355,7 @@ testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLVersionParsing00NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestNEWTCloseX11DisplayBug565 $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMainVersionGLWindowNEWT $*
-#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile00NEWT $*
+testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile00NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile01NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestShutdownCompleteNEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestInitConcurrent01NEWT $*
diff --git a/make/stub_includes/macosx/OpenGL/OpenGL.h b/make/stub_includes/macosx/OpenGL/OpenGL.h
index 3347209b3..86d831191 100644
--- a/make/stub_includes/macosx/OpenGL/OpenGL.h
+++ b/make/stub_includes/macosx/OpenGL/OpenGL.h
@@ -59,7 +59,8 @@ typedef enum _CGLPixelFormatAttribute {
  */
 typedef enum _CGLOpenGLProfile {
     kCGLOGLPVersion_Legacy   = 0x1000,      /* Legacy/Pre-OpenGL 3.0 */
-    kCGLOGLPVersion_3_2_Core = 0x3200       /* OpenGL 3.2 Core */
+    kCGLOGLPVersion_GL3_Core = 0x3200,      /* OpenGL 3 Core */
+    kCGLOGLPVersion_GL4_Core = 0x4100       /* OpenGL 4 Core */
 } CGLOpenGLProfile;
 
 /*