diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2008-07-25 18:31:44 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2008-07-25 18:31:44 -0700 |
| commit | 1e645b365900cf1c71ca5594bd6b549a1f203040 (patch) | |
| tree | d114e55df428550c9829acf929b9fb7bcb89c429 /progs/tools/trace | |
| parent | e5022c3fdf9888857f22f9a1690035ff3f90d36b (diff) | |
| parent | 9bc9e0ecb0fb2069b2c123e665eb2118e358098f (diff) | |
Merge branch 'master' into drm-gem
Conflicts:
src/mesa/drivers/dri/common/dri_bufmgr.c
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
Diffstat (limited to 'progs/tools/trace')
| -rw-r--r-- | progs/tools/trace/Makefile | 2 | ||||
| -rw-r--r-- | progs/tools/trace/gltrace_support.cc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/progs/tools/trace/Makefile b/progs/tools/trace/Makefile index 4b05fd87a5..822e466ad1 100644 --- a/progs/tools/trace/Makefile +++ b/progs/tools/trace/Makefile @@ -16,7 +16,7 @@ TRACER = gltrace.so default: $(TRACER) $(TRACER): $(OBJECTS) - $(TOP)/bin/mklib -o $(TRACER) -noprefix -cplusplus \ + $(MKLIB) -o $(TRACER) -noprefix -cplusplus -linker '$(CXX)' \ -ldflags '$(LDFLAGS)' $(MKLIB_OPTIONS) $(OBJECTS) gltrace.cc: gltrace.py diff --git a/progs/tools/trace/gltrace_support.cc b/progs/tools/trace/gltrace_support.cc index b188e73f29..0b76d3247d 100644 --- a/progs/tools/trace/gltrace_support.cc +++ b/progs/tools/trace/gltrace_support.cc @@ -20,6 +20,8 @@ */ #include "gltrace_support.h" +#include <cstdlib> +#include <cstring> #include <assert.h> #include <sstream> #include <fstream> @@ -136,7 +138,7 @@ namespace gltrace { struct timeval now; struct tm t; - static char *months[12] = + static char const *months[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" |