prepare for rust-lang/rust-bindgen#603 to be fixed

Author: dimbleby

c-ares-sys/ffi.patch

@@ -1,5 +1,5 @@
---- src/ffi.rs.orig	2017-03-19 19:51:56.047460398 +0000
-+++ src/ffi.rs	2017-03-19 20:05:08.080603066 +0000
+--- src/ffi.rs.orig	2017-04-03 23:03:08.683728945 +0100
++++ src/ffi.rs	2017-04-03 23:03:08.727729681 +0100
 @@ -1,4 +1,12 @@
  /* automatically generated by rust-bindgen */
 +#![allow(non_camel_case_types, non_snake_case)]
@@ -307,7 +307,7 @@
      fn clone(&self) -> Self { *self }
  }
 @@ -641,28 +428,6 @@
-     pub host: *mut ::std::os::raw::c_schar,
+     pub host: *mut ::std::os::raw::c_char,
      pub priority: ::std::os::raw::c_ushort,
  }
 -#[test]

c-ares-sys/generate-ffi.sh

@@ -6,14 +6,16 @@ then
   exit 1
 fi
 
-# Prepare for bindgen, do it, and then apply manual patches.
+# Prepare for bindgen, and do it.
 (cd c-ares && ./buildconf && ./configure)
 bindgen --whitelist-function="ares.*" --whitelist-type="ares.*" --whitelist-type="apattern" --no-recursive-whitelist --no-unstable-rust --output=src/ffi.rs c-ares/ares.h
-patch -p0 < ffi.patch
 
 # bindgen converts 'char' to 'c_schar' - see https://github.com/servo/rust-bindgen/issues/603.
 # Since c-ares never uses 'signed char' we can compensate with simple search-and-replace.
 sed -i 's/c_schar/c_char/g' src/ffi.rs
 
+# Apply manual patches.
+patch -p0 < ffi.patch
+
 # Generate constants.
 ./generate-constants.pl > src/constants.rs