diff options
| author | Brian Paul <brianp@vmware.com> | 2009-07-28 08:58:25 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-07-28 08:58:25 -0600 |
| commit | d2f6d6ce49699d35d6b6a234fe17a27d99f4b267 (patch) | |
| tree | 22fcb97333ad7b6c57eb539c512a1dcc3d15a3aa /src/mesa/main | |
| parent | 94726bc69e5f9dbefb34a38695f2f51d81ff433f (diff) | |
| parent | bc60b884110b9e41ee3082075717587cc38380b5 (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
Makefile
configs/default
docs/relnotes.html
src/mesa/main/version.h
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/compiler.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h index e79bbc2ac5..9319505a75 100644 --- a/src/mesa/main/compiler.h +++ b/src/mesa/main/compiler.h @@ -110,10 +110,8 @@ extern "C" { #if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__) && !defined(BUILD_FOR_SNAP) # define __WIN32__ # define finite _finite -#endif -#if defined(__WATCOMC__) +#elif defined(__WATCOMC__) # define finite _finite -# pragma disable_message(201) /* Disable unreachable code warnings */ #endif @@ -135,6 +133,10 @@ extern "C" { # endif # endif #endif +#if defined(__WATCOMC__) +# pragma disable_message(201) /* Disable unreachable code warnings */ +#endif + /** |