Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-24 20:01:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More OS compat fixes.

Browse Source
This commit is contained in:
Moritz Bunkus 2004-02-12 19:05:55 +00:00
parent fe253daa6f
commit cf55bc22a5
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/mm_io.h
View File

@ -33,7 +33,7 @@ using namespace libebml;
class MTX_DLL_API mm_io_c: public IOCallback {
protected:
#if !defined(SYS_UNIX)
#if defined(SYS_WINDOWS)
bool _eof;
#endif
char *file_name;

4
src/mkvinfo.cpp
View File

@ -2538,7 +2538,7 @@ int console_main(int argc, char **argv) {
}
void setup() {
#if defined(SYS_UNIX)
#if !defined(COMP_MSC)
if (setlocale(LC_CTYPE, "") == NULL)
mxerror("Could not set the locale properly. Check the "
"LANG, LC_ALL and LC_CTYPE environment variables.\n");
@ -2565,7 +2565,7 @@ int main(int argc, char **argv) {
return res;
}
#elif defined(SYS_UNIX)
#elif defined(SYS_UNIX) || defined(SYS_APPLE)
int main(int argc, char **argv) {
char *initial_file;

6
src/mkvmerge.cpp
View File

@ -24,7 +24,7 @@
#include <errno.h>
#include <ctype.h>
#if defined(SYS_UNIX) || defined(COMP_CYGWIN)
#if defined(SYS_UNIX) || defined(COMP_CYGWIN) || defined(SYS_APPLE)
#include <signal.h>
#endif
#include <stdlib.h>
@ -426,7 +426,7 @@ static int get_type(char *filename) {
// {{{ helper functions (sighandler, display_progress)
#if defined(SYS_UNIX) || defined(COMP_CYGWIN)
#if defined(SYS_UNIX) || defined(COMP_CYGWIN) || defined(SYS_APPLE)
static void sighandler(int signum) {
#ifdef DEBUG
if (signum == SIGUSR1)
@ -1935,7 +1935,7 @@ static void setup() {
"LANG, LC_ALL and LC_CTYPE environment variables.\n");
#endif
#if defined(SYS_UNIX) || defined(COMP_CYGWIN)
#if defined(SYS_UNIX) || defined(COMP_CYGWIN) || defined(SYS_APPLE)
signal(SIGUSR1, sighandler);
signal(SIGINT, sighandler);

4
src/mmg/mmg.cpp
View File

@ -35,7 +35,7 @@
#include "chapters.h"
#include "common.h"
#ifdef SYS_UNIX
#if defined(SYS_UNIX) || defined(SYS_APPLE)
#include "matroskalogo_big.xpm"
#endif
#include "mmg.h"
@ -102,7 +102,7 @@ wxString shell_escape(wxString source) {
wxString escaped;
for (i = 0; i < source.Length(); i++) {
#ifdef SYS_UNIX
#if defined(SYS_UNIX) || defined(SYS_APPLE)
if (source[i] == '"')
escaped += "\\\"";
else if (source[i] == '\\')