diff options
| author | Christian König <[email protected]> | 2011-01-20 22:43:18 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-01-20 22:43:18 +0100 |
| commit | 78faf8d0e9c276a0ff1465e501d58fb3d66de2f7 (patch) | |
| tree | 4e124bd6b511e408c5e113c4166b8fa97fd75b24 /src/mesa/main/enums.h | |
| parent | d2ff6b8715e817c1ef14d4bf12be58c19d894143 (diff) | |
| parent | 37233f1ee0213a224611788bbab38840ba9f8308 (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_asm.c
Diffstat (limited to 'src/mesa/main/enums.h')
| -rw-r--r-- | src/mesa/main/enums.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/enums.h b/src/mesa/main/enums.h index c03cd34da92..7733df22f91 100644 --- a/src/mesa/main/enums.h +++ b/src/mesa/main/enums.h @@ -45,7 +45,7 @@ extern const char *_mesa_lookup_enum_by_nr( int nr ); /* Get the name of an enum given that it is a primitive type. Avoids * GL_FALSE/GL_POINTS ambiguity and others. */ -const char *_mesa_lookup_prim_by_nr( int nr ); +const char *_mesa_lookup_prim_by_nr( unsigned nr ); extern int _mesa_lookup_enum_by_name( const char *symbol ); |