diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-08-11 16:07:56 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-08-11 16:07:56 +1000 |
| commit | f56eda6a85912dee9eef9099f6023c6bab05a41a (patch) | |
| tree | 068107b1bcf1aec4847c059e18a3e5f3a0b3c303 /src/gallium/include/pipe/p_format.h | |
| parent | ce8e846ffea8e1a11b8ae4ba05a7386e7c34cc9f (diff) | |
| parent | 5549d35db5323829702099af6e53a8dd7c451524 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/include/pipe/p_format.h')
| -rw-r--r-- | src/gallium/include/pipe/p_format.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/include/pipe/p_format.h b/src/gallium/include/pipe/p_format.h index 947c445583..d9aa5792a4 100644 --- a/src/gallium/include/pipe/p_format.h +++ b/src/gallium/include/pipe/p_format.h @@ -28,11 +28,11 @@ #ifndef PIPE_FORMAT_H #define PIPE_FORMAT_H -#include "util/u_string.h" - #include "p_compiler.h" #include "p_debug.h" +#include "util/u_string.h" + #ifdef __cplusplus extern "C" { #endif @@ -379,7 +379,7 @@ enum pipe_format { /** * Builds pipe format name from format token. */ -extern char *pf_sprint_name( char *str, enum pipe_format format ); +extern const char *pf_name( enum pipe_format format ); /** * Return bits for a particular component. |