Update CI build configuration.

Fix missing size_t on latest stable

See merge request ndarilek/speech-dispatcher-rs!7

.drone.yml

@@ -9,16 +9,16 @@ steps:
       - rustup component add clippy rustfmt
       - apt-get update -qq
       - apt-get install -qqy llvm-dev libclang-dev clang libspeechd-dev
-      - cargo fmt --check
-      - cargo test
-      - cargo clippy
+      - cargo fmt --all --check
+      - cargo test --no-default-features --features 0_10
+      - cargo clippy --no-default-features --features 0_10
   - name: release
     image: rust
     commands:
       - apt-get update -qq
       - apt-get install -qqy llvm-dev libclang-dev clang libspeechd-dev
-      - cargo publish --manifest-path speech-dispatcher-sys/Cargo.toml || true                                                                                                                                       
-      - cargo publish --manifest-path speech-dispatcher/Cargo.toml                                                                                                                                                   
+      - cargo publish --no-default-features --features 0_10 --manifest-path speech-dispatcher-sys/Cargo.toml || true                                                                                                                                       
+      - cargo publish --no-default-features --features 0_10 --manifest-path speech-dispatcher/Cargo.toml                                                                                                                                                   
      when:
       ref:
         - refs/tags/v*

speech-dispatcher/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "speech-dispatcher"
-version = "0.15.0"
+version = "0.16.0"
 authors = ["Nolan Darilek <nolan@thewordnerd.info>"]
 repository = "https://gitlab.com/ndarilek/speech-dispatcher-rs"
 description = "Rusty interface to the speech-dispatcher speech synthesis library"
@@ -10,14 +10,17 @@ edition = "2021"
 [features]
 0_11 = ["0_10"]
 0_10 = []
+0_9 = []
 default = ["0_11"]
 
 [dependencies]
 lazy_static = "1"
 speech-dispatcher-sys = { version = "0.7", path = "../speech-dispatcher-sys" }
+libc = "0.2.125"
 
 [package.metadata.docs.rs]
 no-default-features = true
+features = ["0_9"]
 
 [package.metadata.release]
 tag-prefix = ""

speech-dispatcher/src/lib.rs

@@ -1,5 +1,6 @@
 #![allow(non_upper_case_globals)]
 
+use libc::size_t;
 use std::{
     collections::HashMap,
     ffi::{CStr, CString},
@@ -98,6 +99,7 @@ pub enum Notification {
 #[repr(u32)]
 pub enum Punctuation {
     All = SPDPunctuation::SPD_PUNCT_ALL,
+    #[cfg(feature = "0_10")]
     Most = SPDPunctuation::SPD_PUNCT_MOST,
     Some = SPDPunctuation::SPD_PUNCT_SOME,
     None = SPDPunctuation::SPD_PUNCT_NONE,
@@ -412,25 +414,25 @@ impl Connection {
     }
 
     pub fn set_voice_type(&self, voice_type: VoiceType) -> Result<(), Error> {
-        #[cfg(all(feature = "0_10", not(feature = "0_11")))]
+        #[cfg(all(any(feature = "0_9", feature = "0_10"), not(feature = "0_11")))]
         let v = unsafe { spd_set_voice_type(*self.0, voice_type as u32) };
-        #[cfg(any(feature = "0_11", not(feature = "0_10")))]
+        #[cfg(all(not(feature = "0_9"), any(feature = "0_11", not(feature = "0_10"))))]
         let v = unsafe { spd_set_voice_type(*self.0, voice_type as i32) };
         c_int_to_result(v)
     }
 
     pub fn set_voice_type_all(&self, voice_type: VoiceType) -> Result<(), Error> {
-        #[cfg(all(feature = "0_10", not(feature = "0_11")))]
+        #[cfg(all(any(feature = "0_9", feature = "0_10"), not(feature = "0_11")))]
         let v = unsafe { spd_set_voice_type_all(*self.0, voice_type as u32) };
-        #[cfg(any(feature = "0_11", not(feature = "0_10")))]
+        #[cfg(all(not(feature = "0_9"), any(feature = "0_11", not(feature = "0_10"))))]
         let v = unsafe { spd_set_voice_type_all(*self.0, voice_type as i32) };
         c_int_to_result(v)
     }
 
     pub fn set_voice_type_uid(&self, voice_type: VoiceType, target_uid: u32) -> Result<(), Error> {
-        #[cfg(all(feature = "0_10", not(feature = "0_11")))]
+        #[cfg(all(any(feature = "0_9", feature = "0_10"), not(feature = "0_11")))]
         let v = unsafe { spd_set_voice_type_uid(*self.0, voice_type as u32, target_uid) };
-        #[cfg(any(feature = "0_11", not(feature = "0_10")))]
+        #[cfg(all(not(feature = "0_9"), any(feature = "0_11", not(feature = "0_10"))))]
         let v = unsafe { spd_set_voice_type_uid(*self.0, voice_type as i32, target_uid) };
         c_int_to_result(v)
     }