make it multiplatform

Author: Simone Mosciatti

Cargo.lock

@@ -13,9 +13,9 @@ uuid = { version = "0.4", features = ["v4"] }
 log = {version = "0.3.8", features = ["release_max_level_warn"]}
 env_logger = "0.4.3"
 redisql_lib = {path = "./redisql_lib"}
-# engine_pro = {path = "./engine_pro", optional = true}
+engine_pro = {path = "./engine_pro", optional = true}
 
 [features]
 default = []
-
-# pro = ["engine_pro"]
+pro = ["engine_pro"]
+trial = ["engine_pro/trial"]

Cargo.toml

@@ -49,8 +49,8 @@ fn main() {
         }
     }
 
-    // let engine_pro = "-DENGINE_PRO=1";
-    let engine_pro = "-DENGINE_PRO=0";
+    let engine_pro = "-DENGINE_PRO=1";
+    // let engine_pro = "-DENGINE_PRO=0";
 
     let bindings =
         bindgen::Builder::default()

redisql_lib/build.rs

@@ -6,7 +6,7 @@ use std::string;
 use std::fs::File;
 use std::io::BufReader;
 
-use std::os::raw::c_long;
+use std::os::raw::{c_long, c_char};
 
 use std::io::{Read, Write};
 
@@ -297,7 +297,7 @@ fn reply_with_simple_string(ctx: *mut rm::ffi::RedisModuleCtx,
                             -> i32 {
     unsafe {
         rm::ffi::RedisModule_ReplyWithSimpleString
-            .unwrap()(ctx, s.as_ptr() as *const i8)
+            .unwrap()(ctx, s.as_ptr() as *const c_char)
     }
 }
 

redisql_lib/src/redis.rs

@@ -114,7 +114,7 @@ pub fn ReplyWithError(ctx: Context, error: &str) -> i32 {
     unsafe {
         ffi::RedisModule_ReplyWithError.unwrap()(ctx.as_ptr(),
                                                  error.as_ptr() as
-                                                 *const i8)
+                                                 *const c_char)
     }
 }
 
@@ -208,8 +208,10 @@ pub unsafe fn EmitAOF(aof: &AOF,
                       key: *mut ffi::RedisModuleString,
                       data: &str) {
     ffi::RedisModule_EmitAOF.unwrap()(aof.as_ptr(),
-                                      command.as_ptr() as *const i8,
-                                      specifier.as_ptr() as *const i8,
+                                      command.as_ptr() as
+                                      *const c_char,
+                                      specifier.as_ptr() as
+                                      *const c_char,
                                       key,
                                       data.as_ptr())
 }