Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
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
videolan
vlc-2-2
Commits
bb192bb6
Commit
bb192bb6
authored
Aug 19, 2009
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update live Win64 patch to fix uintptr_t vs intptr_t
parent
0ae751d3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
extras/contrib/src/Patches/live-win64.patch
extras/contrib/src/Patches/live-win64.patch
+8
-8
No files found.
extras/contrib/src/Patches/live-win64.patch
View file @
bb192bb6
...
...
@@ -14,19 +14,19 @@ diff -ruN live/BasicUsageEnvironment/BasicHashTable.cpp live.new/BasicUsageEnvir
unsigned BasicHashTable::hashIndexFromKey(char const* key) const {
- unsigned result = 0;
+ intptr_t result = 0;
+
u
intptr_t result = 0;
if (fKeyType == STRING_HASH_KEYS) {
while (1) {
char c = *key++;
if (c == 0) break;
- result += (result<<3) + (unsigned)c;
+ result += (result<<3) + (intptr_t)c;
+ result += (result<<3) + (
u
intptr_t)c;
}
result &= fMask;
} else if (fKeyType == ONE_WORD_HASH_KEYS) {
- result = randomIndex((unsigned long)key);
+ result = randomIndex((intptr_t)key);
+ result = randomIndex((
u
intptr_t)key);
} else {
unsigned* k = (unsigned*)key;
unsigned long sum = 0;
...
...
@@ -66,7 +66,7 @@ diff -ruN live/groupsock/Groupsock.cpp live.new/groupsock/Groupsock.cpp
TunnelEncapsulationTrailer* trailer;
- Boolean misaligned = ((unsigned long)trailerInPacket & 3) != 0;
+ Boolean misaligned = ((intptr_t)trailerInPacket & 3) != 0;
+ Boolean misaligned = ((
u
intptr_t)trailerInPacket & 3) != 0;
unsigned trailerOffset;
u_int8_t tunnelCmd;
if (isSSM()) {
...
...
@@ -130,17 +130,17 @@ diff -ruN live/liveMedia/RTCP.cpp live.new/liveMedia/RTCP.cpp
HashTable::Iterator* iter
= HashTable::Iterator::create(*fTable);
- unsigned long timeCount;
+ intptr_t timeCount;
+
u
intptr_t timeCount;
char const* key;
- while ((timeCount = (unsigned long)(iter->next(key))) != 0) {
+ while ((timeCount = (intptr_t)(iter->next(key))) != 0) {
+ while ((timeCount = (
u
intptr_t)(iter->next(key))) != 0) {
#ifdef DEBUG
fprintf(stderr, "reap: checking SSRC 0x%lx: %ld (threshold %d)\n", (unsigned long)key, timeCount, threshold);
#endif
- if (timeCount < (unsigned long)threshold) { // this SSRC is old
- unsigned long ssrc = (unsigned long)key;
+ if (timeCount < (intptr_t)threshold) { // this SSRC is old
+ intptr_t ssrc = (intptr_t)key;
+ if (timeCount < (
u
intptr_t)threshold) { // this SSRC is old
+ intptr_t ssrc = (
u
intptr_t)key;
oldSSRC = (unsigned)ssrc;
foundOldMember = True;
}
...
...
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