Auto merge of #965 - cmbrandenburg:fcntl_file_lock, r=alexcrichton

Add flock type value definitions for Linux/other/x86_64