Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
termion
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
redox-os
termion
Commits
dd3df793
Commit
dd3df793
authored
8 years ago
by
Felix Obenhuber
Committed by
ticki
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fixed build for android targets (#72)
Bionic needs signed ioctrl arguments.
parent
1d63c9cd
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/size.rs
+10
-1
10 additions, 1 deletion
src/size.rs
with
10 additions
and
1 deletion
src/size.rs
+
10
−
1
View file @
dd3df793
...
...
@@ -13,6 +13,7 @@ struct TermSize {
}
// Since attributes on non-item statements is not stable yet, we use a function.
#[cfg(not(target_os
=
"android"
))]
#[cfg(not(target_os
=
"redox"
))]
#[cfg(target_pointer_width
=
"64"
)]
#[cfg(not(target_env
=
"musl"
))]
...
...
@@ -20,6 +21,7 @@ fn tiocgwinsz() -> u64 {
use
termios
::
TIOCGWINSZ
;
TIOCGWINSZ
as
u64
}
#[cfg(not(target_os
=
"android"
))]
#[cfg(not(target_os
=
"redox"
))]
#[cfg(target_pointer_width
=
"32"
)]
#[cfg(not(target_env
=
"musl"
))]
...
...
@@ -28,12 +30,19 @@ fn tiocgwinsz() -> u32 {
TIOCGWINSZ
as
u32
}
#[cfg(target_env
=
"musl"
)]
#[cfg(any(target_env
=
"musl"
,
target_os
=
"android"
))]
#[cfg(target_pointer_width
=
"32"
)]
fn
tiocgwinsz
()
->
i32
{
use
termios
::
TIOCGWINSZ
;
TIOCGWINSZ
as
i32
}
#[cfg(target_os
=
"android"
)]
#[cfg(target_pointer_width
=
"64"
)]
fn
tiocgwinsz
()
->
i64
{
use
termios
::
TIOCGWINSZ
;
TIOCGWINSZ
as
i64
}
/// Get the size of the terminal.
#[cfg(not(target_os
=
"redox"
))]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment