Compilation with gcc 2.8

Change-Id: I1e51ae5f145a1eb06424f25bbe412196fab109f3
Merge "Compilation with gcc 2.8"