Fix multilib conflict after 9.11 rebase
    
    Conflict with devel headers reappeared after rebase to 9.11. Fix
    socklen_t in a way that would generate the same types on 32 and 64 bit
    architectures.