summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA.J. Gardner <aaron.j.gardner@gmail.com>2016-03-30 19:59:47 -0500
committerA.J. Gardner <aaron.j.gardner@gmail.com>2016-03-30 19:59:47 -0500
commit874852cff1eb57b9ddf59f80f134543f2fbffde5 (patch)
tree4387dfa9e4a302b199b7ac746dd3898136a5792a
parent912a7a03b4ed5e82836a98f36fe21b15ffbedcad (diff)
downloadrust-libc-874852cff1eb57b9ddf59f80f134543f2fbffde5.tar.gz
Pull lconv def down into notbsd
-rw-r--r--src/unix/mod.rs27
-rw-r--r--src/unix/notbsd/mod.rs27
2 files changed, 27 insertions, 27 deletions
diff --git a/src/unix/mod.rs b/src/unix/mod.rs
index 617caf1d07..649855df81 100644
--- a/src/unix/mod.rs
+++ b/src/unix/mod.rs
@@ -106,33 +106,6 @@ s! {
pub ws_xpixel: ::c_ushort,
pub ws_ypixel: ::c_ushort,
}
-
- pub struct lconv {
- pub decimal_point: *mut ::c_char,
- pub thousands_sep: *mut ::c_char,
- pub grouping: *mut ::c_char,
- pub int_curr_symbol: *mut ::c_char,
- pub currency_symbol: *mut ::c_char,
- pub mon_decimal_point: *mut ::c_char,
- pub mon_thousands_sep: *mut ::c_char,
- pub mon_grouping: *mut ::c_char,
- pub positive_sign: *mut ::c_char,
- pub negative_sign: *mut ::c_char,
- pub int_frac_digits: ::c_char,
- pub frac_digits: ::c_char,
- pub p_cs_precedes: ::c_char,
- pub p_sep_by_space: ::c_char,
- pub n_cs_precedes: ::c_char,
- pub n_sep_by_space: ::c_char,
- pub p_sign_posn: ::c_char,
- pub n_sign_posn: ::c_char,
- pub int_p_cs_precedes: ::c_char,
- pub int_p_sep_by_space: ::c_char,
- pub int_n_cs_precedes: ::c_char,
- pub int_n_sep_by_space: ::c_char,
- pub int_p_sign_posn: ::c_char,
- pub int_n_sign_posn: ::c_char,
- }
}
pub const SIG_DFL: sighandler_t = 0 as sighandler_t;
diff --git a/src/unix/notbsd/mod.rs b/src/unix/notbsd/mod.rs
index 73f63c3823..a7bcf85946 100644
--- a/src/unix/notbsd/mod.rs
+++ b/src/unix/notbsd/mod.rs
@@ -131,6 +131,33 @@ s! {
pub machine: [::c_char; 65],
pub domainname: [::c_char; 65]
}
+
+ pub struct lconv {
+ pub decimal_point: *mut ::c_char,
+ pub thousands_sep: *mut ::c_char,
+ pub grouping: *mut ::c_char,
+ pub int_curr_symbol: *mut ::c_char,
+ pub currency_symbol: *mut ::c_char,
+ pub mon_decimal_point: *mut ::c_char,
+ pub mon_thousands_sep: *mut ::c_char,
+ pub mon_grouping: *mut ::c_char,
+ pub positive_sign: *mut ::c_char,
+ pub negative_sign: *mut ::c_char,
+ pub int_frac_digits: ::c_char,
+ pub frac_digits: ::c_char,
+ pub p_cs_precedes: ::c_char,
+ pub p_sep_by_space: ::c_char,
+ pub n_cs_precedes: ::c_char,
+ pub n_sep_by_space: ::c_char,
+ pub p_sign_posn: ::c_char,
+ pub n_sign_posn: ::c_char,
+ pub int_p_cs_precedes: ::c_char,
+ pub int_p_sep_by_space: ::c_char,
+ pub int_n_cs_precedes: ::c_char,
+ pub int_n_sep_by_space: ::c_char,
+ pub int_p_sign_posn: ::c_char,
+ pub int_n_sign_posn: ::c_char,
+ }
}
// intentionally not public, only used for fd_set