Fix bug 2313 for cross compilation.
2 files changed