* modules/demux/mkv.cpp: Compile fix for OS X.

diff --git a/configure.ac b/configure.ac
index 895fe762f88abbfac2c42af3cad86252da52efc8..a8201498294a545a6287940d486c22af5d3bc7bd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -438,7 +438,7 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[
   AC_MSG_RESULT(no)])
 
 dnl Check for headers
-AC_CHECK_HEADERS(signal.h time.h errno.h stdint.h getopt.h strings.h inttypes.h sys/int_types.h)
+AC_CHECK_HEADERS(signal.h time.h errno.h stdint.h getopt.h strings.h inttypes.h sys/int_types.h wchar.h)
 AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h)
 AC_CHECK_HEADERS(dlfcn.h image.h)
 AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h)

diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index 76fbed538e17c6bfe54531577cf13b7c0a553f80..37b6daf9027a8ac04f6f6aad856386b4ac12d9da 100644 (file)
--- a/modules/demux/mkv.cpp
+++ b/modules/demux/mkv.cpp
@@ -2,7 +2,7 @@
  * mkv.cpp : matroska demuxer
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: mkv.cpp,v 1.15 2003/06/26 16:46:19 fenrir Exp $
+ * $Id: mkv.cpp,v 1.16 2003/06/28 12:07:00 massiot Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -40,7 +40,9 @@
 #include <cassert>
 #include <typeinfo>
 
-#include <wchar.h>
+#ifdef HAVE_WCHAR_H
+#   include <wchar.h>
+#endif
 
 /* libebml and matroska */
 #include "ebml/EbmlHead.h"