* oss-4.2.2008: make it compile against 3.10.7 and 3.11