While I'm here, fix compilation; subtracting 2 pointers on a 64-bit machine gives something the same size as a size_t. Refactor the patches by using 'make makepatch'. PR: 186604 Submitted by: Mikhail - mp39590 gmail com