diff options
| author | Alexander Batischev <eual.jp@gmail.com> | 2019-06-26 20:30:32 +0300 |
|---|---|---|
| committer | Alexander Batischev <eual.jp@gmail.com> | 2019-06-26 20:30:32 +0300 |
| commit | b98f30807161c31fffd46ed10523a64675238dc5 (patch) | |
| tree | ea5f54f04dc7ee72b2976274421655d8aa622d71 | |
| parent | 922591f42af225431b6ad575c063d3299f5196e3 (diff) | |
| parent | d22d10a3bfcb8ad861e5c0c629bfcadf986a81ac (diff) | |
Merge branch 't6-patch-freebsd'
Closes #551.
| -rw-r--r-- | include/filebrowserformaction.h | 1 | ||||
| -rw-r--r-- | include/scopemeasure.h | 1 | ||||
| -rw-r--r-- | rss/item.h | 1 | ||||
| -rw-r--r-- | rss/rssparser.cpp | 1 | ||||
| -rw-r--r-- | rust/libnewsboat-ffi/src/utils.rs | 4 | ||||
| -rw-r--r-- | rust/libnewsboat/src/utils.rs | 4 |
6 files changed, 9 insertions, 3 deletions
diff --git a/include/filebrowserformaction.h b/include/filebrowserformaction.h index d3db59c0..ff82de14 100644 --- a/include/filebrowserformaction.h +++ b/include/filebrowserformaction.h @@ -1,6 +1,7 @@ #ifndef NEWSBOAT_FILEBROWSERFORMACTION_H_ #define NEWSBOAT_FILEBROWSERFORMACTION_H_ +#include <sys/stat.h> #include <grp.h> #include "configcontainer.h" diff --git a/include/scopemeasure.h b/include/scopemeasure.h index 16c04d71..dae8a683 100644 --- a/include/scopemeasure.h +++ b/include/scopemeasure.h @@ -1,6 +1,7 @@ #ifndef NEWSBOAT_SCOPEMEASURE_H_ #define NEWSBOAT_SCOPEMEASURE_H_ +#include <sys/time.h> #include <string> #include "logger.h" @@ -1,6 +1,7 @@ #ifndef NEWSBOAT_RSSPPITEM_H_ #define NEWSBOAT_RSSPPITEM_H_ +#include <ctime> #include <string> #include <vector> diff --git a/rss/rssparser.cpp b/rss/rssparser.cpp index 8285573f..d46b91df 100644 --- a/rss/rssparser.cpp +++ b/rss/rssparser.cpp @@ -1,6 +1,7 @@ #include "rssparser.h" #include <cstring> +#include <ctime> #include <libxml/tree.h> #include "exception.h" diff --git a/rust/libnewsboat-ffi/src/utils.rs b/rust/libnewsboat-ffi/src/utils.rs index a2df751c..ffc12238 100644 --- a/rust/libnewsboat-ffi/src/utils.rs +++ b/rust/libnewsboat-ffi/src/utils.rs @@ -1,5 +1,5 @@ use abort_on_panic; -use libc::c_char; +use libc::{c_char, c_ulong}; use libnewsboat::utils; use std::ffi::{CStr, CString}; use std::ptr; @@ -229,7 +229,7 @@ pub extern "C" fn rs_get_random_value(rs_max: u32) -> u32 { } #[no_mangle] -pub extern "C" fn rs_get_auth_method(input: *const c_char) -> u64 { +pub extern "C" fn rs_get_auth_method(input: *const c_char) -> c_ulong { abort_on_panic(|| { let rs_input = unsafe { CStr::from_ptr(input) }; let rs_input = rs_input.to_string_lossy().into_owned(); diff --git a/rust/libnewsboat/src/utils.rs b/rust/libnewsboat/src/utils.rs index 03a91f2a..7907079f 100644 --- a/rust/libnewsboat/src/utils.rs +++ b/rust/libnewsboat/src/utils.rs @@ -1,5 +1,6 @@ extern crate curl_sys; extern crate dirs; +extern crate libc; extern crate rand; extern crate regex; extern crate unicode_segmentation; @@ -11,6 +12,7 @@ use self::unicode_segmentation::UnicodeSegmentation; use self::unicode_width::UnicodeWidthStr; use self::url::percent_encoding::*; use self::url::Url; +use libc::c_ulong; use logger::{self, Level}; use std::io::Write; use std::path::{Path, PathBuf}; @@ -290,7 +292,7 @@ pub fn is_valid_podcast_type(mimetype: &str) -> bool { matches || found } -pub fn get_auth_method(method: &str) -> u64 { +pub fn get_auth_method(method: &str) -> c_ulong { match method { "basic" => curl_sys::CURLAUTH_BASIC, "digest" => curl_sys::CURLAUTH_DIGEST, |