[MPlayer-cvslog] r30727 - trunk/stream/stream_cddb.c

[komh]

Author: komh
Date: Thu Feb 25 10:09:57 2010
New Revision: 30727

Log:
Define O_BINARY if it is undefined.
This removes a platform check for open().

Modified:
   trunk/stream/stream_cddb.c

Modified: trunk/stream/stream_cddb.c
==============================================================================
--- trunk/stream/stream_cddb.c	Thu Feb 25 09:39:55 2010	(r30726)
+++ trunk/stream/stream_cddb.c	Thu Feb 25 10:09:57 2010	(r30727)
@@ -74,6 +74,10 @@
 #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/"
 
@@ -349,11 +353,7 @@ int cddb_read_cache(cddb_data_t *cddb_da
 
     sprintf(file_name, "%s%08lx", cddb_data->cache_dir, cddb_data->disc_id);
 
-    file_fd = open(file_name, O_RDONLY
-#if defined(__MINGW32__) || defined(__CYGWIN__)
-    | O_BINARY
-#endif
-   );
+    file_fd = open(file_name, O_RDONLY | O_BINARY);
     if (file_fd < 0) {
         mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_MPDEMUX_CDDB_NoCacheFound);
         return -1;