Ah, yes, you're right. Go ahead with the original patch then. -Brian
Alan Coopersmith wrote: > I checked the Khronos copy listed in the header, but they don't have the > EGLScreenMESA or EGLModeMESA typedefs in, and given the names and the > " EGL_MESA_screen extension >>> PRELIMINARY <<< " comment, I assumed > they were Mesa additions. > > It could also be fixed in another header with a simple: > #ifdef __sun > typedef uint32_t u_int32_t > #endif > > Would eglplatform.h be the right header for that? > > -alan- > > Brian Paul wrote: >> Alan, the eglext.h file comes direct from Khronos. I can push this change >> up to Khronos, but if this isn't essential, could we leave this as-is? >> >> -Brian >> >> Alan Coopersmith wrote: >>> Signed-off-by: Alan Coopersmith <[email protected]> >>> --- >>> include/EGL/eglext.h | 4 ++-- >>> include/EGL/eglplatform.h | 2 +- >>> src/mesa/drivers/dri/common/utils.c | 2 +- >>> 3 files changed, 4 insertions(+), 4 deletions(-) >>> >>> diff --git a/include/EGL/eglext.h b/include/EGL/eglext.h >>> index a4698cc..b65f7f2 100644 >>> --- a/include/EGL/eglext.h >>> +++ b/include/EGL/eglext.h >>> @@ -136,8 +136,8 @@ typedef EGLBoolean (EGLAPIENTRYP >>> PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGL >>> #define EGL_INTERLACED_MESA 0x4008 >>> #define EGL_SCREEN_BIT_MESA 0x08 >>> >>> -typedef u_int32_t EGLScreenMESA; >>> -typedef u_int32_t EGLModeMESA; >>> +typedef uint32_t EGLScreenMESA; >>> +typedef uint32_t EGLModeMESA; >>> >>> #ifdef EGL_EGLEXT_PROTOTYPES >>> EGLAPI EGLBoolean EGLAPIENTRY eglChooseModeMESA(EGLDisplay dpy, >>> EGLScreenMESA screen, const EGLint *attrib_list, EGLModeMESA *modes, EGLint >>> modes_size, EGLint *num_modes); >>> diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h >>> index d873428..0f34da0 100644 >>> --- a/include/EGL/eglplatform.h >>> +++ b/include/EGL/eglplatform.h >>> @@ -57,7 +57,7 @@ >>> #endif >>> >>> typedef long int32_t; >>> -typedef unsigned long u_int32_t; >>> +typedef unsigned long uint32_t; >>> typedef unsigned char uint8_t; >>> #define snprintf _snprintf >>> #define strcasecmp _stricmp >>> diff --git a/src/mesa/drivers/dri/common/utils.c >>> b/src/mesa/drivers/dri/common/utils.c >>> index c9acd81..66f277c 100644 >>> --- a/src/mesa/drivers/dri/common/utils.c >>> +++ b/src/mesa/drivers/dri/common/utils.c >>> @@ -481,7 +481,7 @@ driCreateConfigs(GLenum fb_format, GLenum fb_type, >>> const uint8_t * depth_bits, const uint8_t * stencil_bits, >>> unsigned num_depth_stencil_bits, >>> const GLenum * db_modes, unsigned num_db_modes, >>> - const u_int8_t * msaa_samples, unsigned num_msaa_modes) >>> + const uint8_t * msaa_samples, unsigned num_msaa_modes) >>> { >>> static const uint8_t bits_table[4][4] = { >>> /* R G B A */ > ------------------------------------------------------------------------------ _______________________________________________ Mesa3d-dev mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
