diff options
| author | marha <marha@users.sourceforge.net> | 2012-12-05 09:16:39 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-12-05 09:16:39 +0100 |
| commit | 52fc95bab22331376f6a7351fdc07f805bd67610 (patch) | |
| tree | d93c6fce43dab496004a97a4dfc8bb38e5da6f5a /mesalib/src/mesa/main/syncobj.c | |
| parent | 6e1f3114a922dc8ac7c1ae0c20d64b8f7a0f5ef7 (diff) | |
| parent | e82692e521240c5f8592f9ce56c9d5b3d68870ec (diff) | |
| download | vcxsrv-52fc95bab22331376f6a7351fdc07f805bd67610.tar.gz vcxsrv-52fc95bab22331376f6a7351fdc07f805bd67610.tar.bz2 vcxsrv-52fc95bab22331376f6a7351fdc07f805bd67610.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa git update 5 dec 2012
Diffstat (limited to 'mesalib/src/mesa/main/syncobj.c')
| -rw-r--r-- | mesalib/src/mesa/main/syncobj.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/syncobj.c b/mesalib/src/mesa/main/syncobj.c index 847612c3b..598414596 100644 --- a/mesalib/src/mesa/main/syncobj.c +++ b/mesalib/src/mesa/main/syncobj.c @@ -55,6 +55,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ +#include <inttypes.h> #include "glheader.h" #include "imports.h" #include "context.h" @@ -357,7 +358,8 @@ _mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout) } if (timeout != GL_TIMEOUT_IGNORED) { - _mesa_error(ctx, GL_INVALID_VALUE, "glWaitSync(timeout=0x%lx)", timeout); + _mesa_error(ctx, GL_INVALID_VALUE, "glWaitSync(timeout=0x%" PRIx64 ")", + (uint64_t) timeout); return; } |