summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Rossi <[email protected]>2015-08-21 23:46:27 +0200
committerEmil Velikov <[email protected]>2015-09-09 15:25:35 +0100
commite838d91b94c3d1d20db62a61bfd9163f675d3139 (patch)
tree41de06c48964d589f511cd5f321294a6de024045
parentd9df8c2fa274629de689c7e364c3c1a65f0b7d0c (diff)
nouveau: android: add space before PRIx64 macro
Otherwise the android build fails with error : unable to find string literal operator ‘operator"" PRIx64’ There are several resources referring to the problem, which is related to c++11, in our case used when building mesa for lollipop. http://comments.gmane.org/gmane.comp.graphics.opensg.user/5883 I've not investigated all the semantics, some people even suggested a bug in the gcc compiler, I just saw the building error was solved with one little space for lollipop and no side effect when c+11 not used. v2: [Emil Velikov] add an alternative commit message from Mauro. Cc: 11.0 <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
-rw-r--r--src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp
index 9ebdc6586db..5f30f3d354b 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp
@@ -411,7 +411,7 @@ int ImmediateValue::print(char *buf, size_t size, DataType ty) const
case TYPE_U64:
case TYPE_S64:
default:
- PRINT("0x%016"PRIx64, reg.data.u64);
+ PRINT("0x%016" PRIx64, reg.data.u64);
break;
}
return pos;