diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-06 08:48:23 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-06 08:48:23 +0200 |
| commit | aa10a08696cae93799fcddae3f0245ceee905e01 (patch) | |
| tree | 950730c362229584b5e60fc1fe309325b7ba66b1 /mesalib/src/mesa/x86 | |
| parent | af1e359cc622a0c53d5632fb03ef9bd4c17de897 (diff) | |
| download | vcxsrv-aa10a08696cae93799fcddae3f0245ceee905e01.tar.gz vcxsrv-aa10a08696cae93799fcddae3f0245ceee905e01.tar.bz2 vcxsrv-aa10a08696cae93799fcddae3f0245ceee905e01.zip | |
xserver mesa git update 6 sep 2012
Diffstat (limited to 'mesalib/src/mesa/x86')
| -rw-r--r-- | mesalib/src/mesa/x86/common_x86.c | 6 | ||||
| -rw-r--r-- | mesalib/src/mesa/x86/norm_args.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mesalib/src/mesa/x86/common_x86.c b/mesalib/src/mesa/x86/common_x86.c index b70ee5084..629950723 100644 --- a/mesalib/src/mesa/x86/common_x86.c +++ b/mesalib/src/mesa/x86/common_x86.c @@ -82,7 +82,7 @@ extern void _mesa_test_os_sse_support( void ); extern void _mesa_test_os_sse_exception_support( void ); -#if defined(WIN32) +#if defined(_WIN32) #ifndef STATUS_FLOAT_MULTIPLE_TRAPS # define STATUS_FLOAT_MULTIPLE_TRAPS (0xC00002B5L) #endif @@ -110,7 +110,7 @@ static LONG WINAPI ExceptionFilter(LPEXCEPTION_POINTERS exp) return EXCEPTION_CONTINUE_EXECUTION; } -#endif /* WIN32 */ +#endif /* _WIN32 */ /** @@ -149,7 +149,7 @@ void _mesa_check_os_sse_support( void ) if (ret || !enabled) _mesa_x86_cpu_features &= ~(X86_FEATURE_XMM); } -#elif defined(WIN32) +#elif defined(_WIN32) LPTOP_LEVEL_EXCEPTION_FILTER oldFilter; /* Install our ExceptionFilter */ diff --git a/mesalib/src/mesa/x86/norm_args.h b/mesalib/src/mesa/x86/norm_args.h index 5d352838b..e22f8bbd7 100644 --- a/mesalib/src/mesa/x86/norm_args.h +++ b/mesalib/src/mesa/x86/norm_args.h @@ -36,10 +36,10 @@ /* Offsets for normal_func arguments * - * typedef void (*normal_func)( CONST GLmatrix *mat, + * typedef void (*normal_func)( const GLmatrix *mat, * GLfloat scale, - * CONST GLvector4f *in, - * CONST GLfloat lengths[], + * const GLvector4f *in, + * const GLfloat lengths[], * GLvector4f *dest ); */ #define OFFSET_MAT 4 |