I have fixed the build failure and attached a patch with interdiff. please re...