Merge "Removed shadow warnings : mcomp.c rdopt.c"