Fixing the code to C ansi.
Merge problems