Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
837bf32e
Commit
837bf32e
authored
Nov 13, 2009
by
Pierre Ynard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: fix live555 on WinCE
Remove patch merged upstream
parent
6d0742dc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
45 deletions
+0
-45
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+0
-3
extras/contrib/src/Patches/live-wince.patch
extras/contrib/src/Patches/live-wince.patch
+0
-42
No files found.
extras/contrib/src/Makefile
View file @
837bf32e
...
...
@@ -1222,9 +1222,6 @@ live: live555-$(LIVEDOTCOM_VERSION).tar.gz
ifdef
HAVE_WIN64
patch
-p0
< Patches/live-win64.patch
endif
ifdef
HAVE_WINCE
patch
-p0
< Patches/live-wince.patch
endif
.live
:
live
ifdef
HAVE_WIN32
...
...
extras/contrib/src/Patches/live-wince.patch
deleted
100644 → 0
View file @
6d0742dc
diff -urp live.orig/groupsock/GroupsockHelper.cpp live/groupsock/GroupsockHelper.cpp
--- live.orig/groupsock/GroupsockHelper.cpp 2009-09-28 17:16:16.000000000 +0200
+++ live/groupsock/GroupsockHelper.cpp 2009-11-11 01:10:28.000000000 +0100
@@ -728,7 +728,7 @@
char const* timestampString() {
int gettimeofday(struct timeval* tp, int* /*tz*/) {
#if defined(_WIN32_WCE)
/* FILETIME of Jan 1 1970 00:00:00. */
- static const unsigned __int64 epoch = 116444736000000000L;
+ static const unsigned __int64 epoch = 116444736000000000LL;
FILETIME file_time;
SYSTEMTIME system_time;
diff -urp live.orig/liveMedia/InputFile.cpp live/liveMedia/InputFile.cpp
--- live.orig/liveMedia/InputFile.cpp 2009-09-28 17:16:16.000000000 +0200
+++ live/liveMedia/InputFile.cpp 2009-11-11 01:06:45.000000000 +0100
@@ -35,7 +35,7 @@
FILE* OpenInputFile(UsageEnvironment& en
// Check for a special case file name: "stdin"
if (strcmp(fileName, "stdin") == 0) {
fid = stdin;
-#if defined(__WIN32__) || defined(_WIN32)
+#if (defined(__WIN32__) || defined(_WIN32)) && !defined(_WIN32_WCE)
_setmode(_fileno(stdin), _O_BINARY); // convert to binary mode
#endif
} else {
diff -urp live.orig/liveMedia/OutputFile.cpp live/liveMedia/OutputFile.cpp
--- live.orig/liveMedia/OutputFile.cpp 2009-09-28 17:16:16.000000000 +0200
+++ live/liveMedia/OutputFile.cpp 2009-11-11 01:07:50.000000000 +0100
@@ -35,12 +35,12 @@
FILE* OpenOutputFile(UsageEnvironment& e
// Check for special case 'file names': "stdout" and "stderr"
if (strcmp(fileName, "stdout") == 0) {
fid = stdout;
-#if defined(__WIN32__) || defined(_WIN32)
+#if (defined(__WIN32__) || defined(_WIN32)) && !defined(_WIN32_WCE)
_setmode(_fileno(stdout), _O_BINARY); // convert to binary mode
#endif
} else if (strcmp(fileName, "stderr") == 0) {
fid = stderr;
-#if defined(__WIN32__) || defined(_WIN32)
+#if (defined(__WIN32__) || defined(_WIN32)) && !defined(_WIN32_WCE)
_setmode(_fileno(stderr), _O_BINARY); // convert to binary mode
#endif
} else {
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