diff options
author | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-18 18:57:46 +0100 |
---|---|---|
committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-18 19:03:02 +0100 |
commit | 89ab66448e1bcd78caab6678261c2885dcff741c (patch) | |
tree | be36d7e3eba3f64e54da34ff7ba64b3eb14e56aa /src/glu/sgi/libnurbs/internals/bufpool.h | |
parent | 1074e8e4e47bb4af73c7ef730d0fec40e826cc7e (diff) | |
parent | 5e530d8384b0d9bb867d6407315587c84a443902 (diff) |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
progs/trivial/Makefile
src/mesa/glapi/glthread.c
Diffstat (limited to 'src/glu/sgi/libnurbs/internals/bufpool.h')
-rw-r--r-- | src/glu/sgi/libnurbs/internals/bufpool.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glu/sgi/libnurbs/internals/bufpool.h b/src/glu/sgi/libnurbs/internals/bufpool.h index 8eaafc4fd0..5dd12d4ff2 100644 --- a/src/glu/sgi/libnurbs/internals/bufpool.h +++ b/src/glu/sgi/libnurbs/internals/bufpool.h @@ -53,7 +53,7 @@ class Buffer { class Pool { public: - Pool( int, int, char * ); + Pool( int, int, const char * ); ~Pool( void ); inline void* new_buffer( void ); inline void free_buffer( void * ); @@ -72,7 +72,7 @@ protected: int nextfree; /* byte offset past next free buffer */ int initsize; enum Magic { is_allocated = 0xf3a1, is_free = 0xf1a2 }; - char *name; /* name of the pool */ + const char *name; /* name of the pool */ Magic magic; /* marker for valid pool */ }; |