Mercurial > hg > release > icedtea7-2.0
view patches/boot/javah.patch @ 2462:3ac37175420b
Allow bootstrap build to work with current GNU Classpath CVS.
2011-08-03 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
Apply explicit-inner-class-headers patch as required.
* acinclude.m4: Test for PR classpath/45526
explicitly instead of assuming it is present
when the other bugs are (not true with current
Classpath CVS).
* patches/boot/explicit-inner-class-headers.patch:
Split out from javah.patch so as to apply when other
bugs aren't present.
* patches/boot/javah.patch:
Remove above patch.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 03 Aug 2011 17:58:24 +0100 |
| parents | 3a383ae55a7e |
| children |
line wrap: on
line source
diff -Nru openjdk-boot.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h --- openjdk-boot.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-12-04 23:33:16.000000000 +0000 +++ openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-12-13 21:11:04.000000000 +0000 @@ -27,6 +27,7 @@ #define OGLContext_h_Included #include "sun_java2d_pipe_BufferedContext.h" +#include "sun_java2d_pipe_hw_ContextCapabilities.h" #include "sun_java2d_opengl_OGLContext.h" #include "sun_java2d_opengl_OGLContext_OGLContextCaps.h" @@ -100,39 +101,39 @@ * See OGLContext.java for more on these flags. */ #define CAPS_EMPTY \ - sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EMPTY + sun_java2d_pipe_hw_ContextCapabilities_CAPS_EMPTY #define CAPS_RT_PLAIN_ALPHA \ - sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_RT_PLAIN_ALPHA + sun_java2d_pipe_hw_ContextCapabilities_CAPS_RT_PLAIN_ALPHA #define CAPS_RT_TEXTURE_ALPHA \ - sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_RT_TEXTURE_ALPHA + sun_java2d_pipe_hw_ContextCapabilities_CAPS_RT_TEXTURE_ALPHA #define CAPS_RT_TEXTURE_OPAQUE \ - sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_RT_TEXTURE_OPAQUE + sun_java2d_pipe_hw_ContextCapabilities_CAPS_RT_TEXTURE_OPAQUE #define CAPS_MULTITEXTURE \ - sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_MULTITEXTURE + sun_java2d_pipe_hw_ContextCapabilities_CAPS_MULTITEXTURE #define CAPS_TEXNONPOW2 \ - sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_TEXNONPOW2 + sun_java2d_pipe_hw_ContextCapabilities_CAPS_TEXNONPOW2 #define CAPS_TEXNONSQUARE \ - sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_TEXNONSQUARE + sun_java2d_pipe_hw_ContextCapabilities_CAPS_TEXNONSQUARE #define CAPS_PS20 \ - sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_PS20 + sun_java2d_pipe_hw_ContextCapabilities_CAPS_PS20 #define CAPS_PS30 \ - sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_PS30 + sun_java2d_pipe_hw_ContextCapabilities_CAPS_PS30 #define LAST_SHARED_CAP \ sun_java2d_opengl_OGLContext_OGLContextCaps_LAST_SHARED_CAP #define CAPS_EXT_FBOBJECT \ - sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_FBOBJECT + sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_FBOBJECT #define CAPS_STORED_ALPHA \ - sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_STORED_ALPHA + sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_STORED_ALPHA #define CAPS_DOUBLEBUFFERED \ - sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_DOUBLEBUFFERED + sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_DOUBLEBUFFERED #define CAPS_EXT_LCD_SHADER \ - sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_LCD_SHADER + sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_LCD_SHADER #define CAPS_EXT_BIOP_SHADER \ - sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_BIOP_SHADER + sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_BIOP_SHADER #define CAPS_EXT_GRAD_SHADER \ - sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_GRAD_SHADER + sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_GRAD_SHADER #define CAPS_EXT_TEXRECT \ - sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_TEXRECT + sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_TEXRECT /** * Evaluates to true if the given capability bitmask is present for the