Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLC-Android
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ewout ter Hoeven
VLC-Android
Commits
d5d20501
Commit
d5d20501
authored
Sep 11, 2012
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
threads patch: Remove useless hunk
parent
70919abc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
15 deletions
+1
-15
compile.sh
compile.sh
+1
-1
patches/0001-android-threads-support.patch
patches/0001-android-threads-support.patch
+0
-14
No files found.
compile.sh
View file @
d5d20501
...
...
@@ -88,7 +88,7 @@ export PLATFORM_SHORT_ARCH
export
PATH
=
${
ANDROID_NDK
}
/toolchains/
${
PATH_HOST
}
-
${
GCCVER
}
/prebuilt/
`
uname
|tr A-Z a-z
`
-x86
/bin:
${
PATH
}
# 1/ libvlc, libvlccore and its plugins
TESTED_HASH
=
7a216cf
TESTED_HASH
=
a597327a
if
[
!
-d
"vlc"
]
;
then
echo
"VLC source not found, cloning"
git clone git://git.videolan.org/vlc.git vlc
...
...
patches/0001-android-threads-support.patch
View file @
d5d20501
...
...
@@ -188,20 +188,6 @@ index 1fc2b67..4bdc7b5 100644
#if (_POSIX_TIMERS > 0)
static unsigned vlc_clock_prec;
@@ -141,10 +154,11 @@
void vlc_trace (const char *fn, const char *file, unsigned line)
static inline unsigned long vlc_threadid (void)
{
-#if defined (__linux__)
+#if defined (__ANDROID__)
+ return syscall (__NR_gettid);
+#elif defined (__linux__)
/* glibc does not provide a call for this */
return syscall (SYS_gettid);
-
#else
union { pthread_t th; unsigned long int i; } v = { };
v.th = pthread_self ();
@@ -162,7 +176,7 @@
vlc_thread_fatal (const char *action, int error,
const char *function, const char *file, unsigned line)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment