Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-02-26 08:22:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

treat cygwin more like Linux than Windows

Browse Source 
Fixes the compilation.
This commit is contained in:
Lionel Fourquaux 2015-02-28 12:36:22 +01:00 committed by Moritz Bunkus
parent 1d7a8ca93a
commit 4b42ea2cb7
7 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AUTHORS
View File

@ -77,6 +77,9 @@ Giles, Ralph <giles@mozilla.com>
Grigorcea, Alexandr <cahr.gr@gmail.com>
* New icon for mmg
Fourquaux, Lionel <lionel.fourquaux@normalesup.org>
* Fixes for compilation on Cygwin
Hakobyan, Sergey <sergey.hakobyan@viragelogic.com>
* Support for creating missing output directories
* Using the attachment names in Matroska files for extraction

4
ChangeLog
View File

@ -1,3 +1,7 @@
2015-02-28 Lionel Fourquaux <lionel.fourquaux@normalesup.org>
* source code: Fixed the compilation on cygwin.
2015-02-27 Moritz Bunkus <moritz@bunkus.org>
* documentation: The Dutch, Ukrainian and Chinese (Simplified)

7
src/common/os.h
View File

@ -37,7 +37,7 @@
#endif
#else // HAVE_COREC_H
#if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
#if (defined(_WIN32) || defined(WIN32) || defined(__MINGW32__)) && !defined(__CYGWIN__)
# define SYS_WINDOWS
#elif defined(__APPLE__)
# define SYS_APPLE
@ -52,6 +52,9 @@
# define SYS_SOLARIS
# elif defined(__sun) && defined(__SVR4)
# define SYS_SOLARIS
# elif defined(__CYGWIN__)
# define COMP_CYGWIN
# define SYS_CYGWIN
# else
# define SYS_LINUX
# endif
@ -62,8 +65,6 @@
#if defined(SYS_WINDOWS)
# if defined __MINGW32__
# define COMP_MINGW
# elif defined __CYGWIN__
# define COMP_CYGWIN
# else
# define COMP_MSC
# define NOMINMAX

4
src/input/r_wav.cpp
View File

@ -17,9 +17,7 @@
#include <algorithm>
#if defined(COMP_CYGWIN)
#include <sys/unistd.h> // Needed for swab()
#elif __GNUC__ == 2
#if __GNUC__ == 2
#define MTX_USE_XOPEN
#include <unistd.h>
#elif defined(HAVE_UNISTD_H)

4
src/merge/mkvmerge.cpp
View File

@ -17,7 +17,7 @@
#include <errno.h>
#include <ctype.h>
#if defined(SYS_UNIX) || defined(COMP_CYGWIN) || defined(SYS_APPLE)
#if defined(SYS_UNIX) || defined(SYS_APPLE)
#include <signal.h>
#endif
#include <stdlib.h>
@ -2486,7 +2486,7 @@ setup(int argc,
mtx_common_init("mkvmerge", argv[0]);
g_kax_tracks = new KaxTracks();
#if defined(SYS_UNIX) || defined(COMP_CYGWIN) || defined(SYS_APPLE)
#if defined(SYS_UNIX) || defined(SYS_APPLE)
signal(SIGUSR1, sighandler);
signal(SIGINT, sighandler);
#endif

4
src/merge/output_control.cpp
View File

@ -17,7 +17,7 @@
#include <errno.h>
#include <ctype.h>
#if defined(SYS_UNIX) || defined(COMP_CYGWIN) || defined(SYS_APPLE)
#if defined(SYS_UNIX) || defined(SYS_APPLE)
#include <signal.h>
#endif
#include <stdlib.h>
@ -269,7 +269,7 @@ calculate_file_duration() {
by writing the cues, the meta seek information and by updating the
segment duration and the segment length.
*/
#if defined(SYS_UNIX) || defined(COMP_CYGWIN) || defined(SYS_APPLE)
#if defined(SYS_UNIX) || defined(SYS_APPLE)
void
sighandler(int /* signum */) {
if (!s_out)

2
src/merge/output_control.h
View File

@ -273,7 +273,7 @@ std::string create_output_name();
int64_t add_attachment(attachment_t attachment);
#if defined(SYS_UNIX) || defined(COMP_CYGWIN) || defined(SYS_APPLE)
#if defined(SYS_UNIX) || defined(SYS_APPLE)
void sighandler(int signum);
#endif