mirror of
https://github.com/mpv-player/mpv
synced 2025-01-16 22:37:28 +01:00
Define O_BINARY in stream/stream.h unless it is defined yet, and use it
in other places. This removes platform specific checks and prevents repeated definitions of O_BINARY. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30850 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
ca7cbc0724
commit
dd491c0d28
@ -25,6 +25,11 @@
|
||||
#include <string.h>
|
||||
#include <inttypes.h>
|
||||
#include <sys/types.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
#ifndef O_BINARY
|
||||
#define O_BINARY 0
|
||||
#endif
|
||||
|
||||
#define STREAMTYPE_DUMMY -1 // for placeholders, when the actual reading is handled in the demuxer
|
||||
#define STREAMTYPE_FILE 0 // read from seekable file
|
||||
|
@ -76,10 +76,6 @@
|
||||
#include "network.h"
|
||||
#include "libavutil/common.h"
|
||||
|
||||
#ifndef O_BINARY
|
||||
#define O_BINARY 0
|
||||
#endif
|
||||
|
||||
#define DEFAULT_FREEDB_SERVER "freedb.freedb.org"
|
||||
#define DEFAULT_CACHE_DIR "/.cddb/"
|
||||
|
||||
|
@ -136,9 +136,7 @@ static int open_f(stream_t *stream,int mode, void* opts, int* file_format) {
|
||||
filename++;
|
||||
#endif
|
||||
|
||||
#if defined(__CYGWIN__)|| defined(__MINGW32__) || defined(__OS2__)
|
||||
m |= O_BINARY;
|
||||
#endif
|
||||
|
||||
if(!strcmp(filename,"-")){
|
||||
if(mode == STREAM_READ) {
|
||||
|
@ -79,11 +79,7 @@ static int open_live_sdp(stream_t *stream,int mode, void* opts, int* file_format
|
||||
|
||||
if(strncmp("sdp://",filename,6) == 0) {
|
||||
filename += 6;
|
||||
#if defined(__CYGWIN__) || defined(__MINGW32__)
|
||||
f = open(filename,O_RDONLY|O_BINARY);
|
||||
#else
|
||||
f = open(filename,O_RDONLY);
|
||||
#endif
|
||||
if(f < 0) {
|
||||
mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_FileNotFound,filename);
|
||||
return STREAM_ERROR;
|
||||
|
Loading…
Reference in New Issue
Block a user