Fixed redefinition of timeval_to_msec macro