From fc80bbbf98f5f5abc6401fa363cc13f8dbabd3ef Mon Sep 17 00:00:00 2001
From: Baoshan Pang <baoshan.pang@windriver.com>
Date: Wed, 25 Sep 2019 17:03:57 -0700
Subject: update rtpSpawn prototype

---
 src/vxworks/mod.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vxworks/mod.rs b/src/vxworks/mod.rs
index 8745cd1653..bb931b713f 100755
--- a/src/vxworks/mod.rs
+++ b/src/vxworks/mod.rs
@@ -2074,8 +2074,8 @@ extern "C" {
     pub fn rtpInfoGet(rtpId: ::RTP_ID, rtpStruct: *mut ::RTP_DESC) -> ::c_int;
     pub fn rtpSpawn(
         pubrtpFileName: *const ::c_char,
-        argv: *const *const ::c_char,
-        envp: *const *const ::c_char,
+        argv: *mut *const ::c_char,
+        envp: *mut *const ::c_char,
         priority: ::c_int,
         uStackSize: ::size_t,
         options: ::c_int,
-- 
cgit v1.2.1


From 740ac0c2d0987a7556e1273d5d25e4e7a5ca15e8 Mon Sep 17 00:00:00 2001
From: Baoshan Pang <baoshan.pang@windriver.com>
Date: Wed, 25 Sep 2019 17:19:40 -0700
Subject: Using 'Option' with ::

---
 src/vxworks/mod.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/vxworks/mod.rs b/src/vxworks/mod.rs
index bb931b713f..cc7525c31c 100755
--- a/src/vxworks/mod.rs
+++ b/src/vxworks/mod.rs
@@ -416,9 +416,10 @@ s_no_extra_traits! {
     }
 
     pub union sa_u_t {
-        pub sa_handler : Option<unsafe extern "C" fn(::c_int) -> !>,
-        pub sa_sigaction: Option<unsafe extern "C" fn(::c_int, *mut ::siginfo_t,
-                                        *mut ::c_void) -> !>,
+        pub sa_handler : ::Option<unsafe extern "C" fn(::c_int) -> !>,
+        pub sa_sigaction: ::Option<unsafe extern "C" fn(::c_int,
+                                                        *mut ::siginfo_t,
+                                                        *mut ::c_void) -> !>,
     }
 
     pub union sigval {
-- 
cgit v1.2.1