2 files changed, 47 insertions, 40 deletions
diff --git a/make/stub_includes/macosx/window-system.c b/make/stub_includes/macosx/window-system.c
index e53300830..f2738b454 100644
--- a/make/stub_includes/macosx/window-system.c
+++ b/make/stub_includes/macosx/window-system.c
@@ -1,40 +1 @@
-/* C routines encapsulating small amounts of Objective C code to allow
-   nsContext creation and manipulation to occur from Java */
-
-typedef int Bool;
-
-void* createContext(void* shareContext, void* nsView,
-                    int doubleBuffer,
-                    int stereo,
-                    int redBits,
-                    int greenBits,
-                    int blueBits,
-                    int alphaBits,
-                    int depthBits,
-                    int stencilBits,
-                    int accumRedBits,
-                    int accumGreenBits,
-                    int accumBlueBits,
-                    int accumAlphaBits,
-                    int sampleBuffers,
-                    int numSamples,
-                    int pbuffer,
-                    int floatingPoint,
-                    int* viewNotReady);
-Bool  makeCurrentContext(void* nsContext, void* nsView);
-Bool  clearCurrentContext(void* nsContext, void* nsView);
-Bool  deleteContext(void* nsContext, void* nsView);
-Bool  flushBuffer(void* nsContext, void* nsView);
-void  updateContext(void* nsContext, void* nsView);
-
-void* updateContextRegister(void* nsContext, void* nsView);
-void  updateContextUnregister(void* nsContext, void* nsView, void* updater);
-
-void* createPBuffer(int renderTarget, int internalFormat, int width, int height);
-Bool destroyPBuffer(void* nsContext, void* pBuffer);
-void setContextPBuffer(void* nsContext, void* pBuffer);
-void setContextTextureImageToPBuffer(void* nsContext, void* pBuffer, int colorBuffer);
-
-void* getProcAddress(const char *procName);
-
-void setSwapInterval(void* nsContext, int interval);
+#include "macosx-window-system.h"
diff --git a/make/stub_includes/opengl/macosx-window-system.h b/make/stub_includes/opengl/macosx-window-system.h
new file mode 100644
index 000000000..46ee1c45d
--- /dev/null
+++ b/make/stub_includes/opengl/macosx-window-system.h
@@ -0,0 +1,46 @@
+/* C routines encapsulating small amounts of Objective C code to allow
+   nsContext creation and manipulation to occur from Java
+
+   It's unfortunate this couldn't be placed in the macosx
+   stub_includes directory, but due to the presence of the jni.h stub
+   headers in that directory, if that is in the include path during
+   compilation then the build fails.
+*/
+
+typedef int Bool;
+
+void* createContext(void* shareContext, void* nsView,
+                    int doubleBuffer,
+                    int stereo,
+                    int redBits,
+                    int greenBits,
+                    int blueBits,
+                    int alphaBits,
+                    int depthBits,
+                    int stencilBits,
+                    int accumRedBits,
+                    int accumGreenBits,
+                    int accumBlueBits,
+                    int accumAlphaBits,
+                    int sampleBuffers,
+                    int numSamples,
+                    int pbuffer,
+                    int floatingPoint,
+                    int* viewNotReady);
+Bool  makeCurrentContext(void* nsContext, void* nsView);
+Bool  clearCurrentContext(void* nsContext, void* nsView);
+Bool  deleteContext(void* nsContext, void* nsView);
+Bool  flushBuffer(void* nsContext, void* nsView);
+void  updateContext(void* nsContext, void* nsView);
+
+void* updateContextRegister(void* nsContext, void* nsView);
+void  updateContextUnregister(void* nsContext, void* nsView, void* updater);
+
+void* createPBuffer(int renderTarget, int internalFormat, int width, int height);
+Bool destroyPBuffer(void* nsContext, void* pBuffer);
+void setContextPBuffer(void* nsContext, void* pBuffer);
+void setContextTextureImageToPBuffer(void* nsContext, void* pBuffer, int colorBuffer);
+
+void* getProcAddress(const char *procName);
+
+void setSwapInterval(void* nsContext, int interval);