macosx: Fix controller playlist toggling to use the contentRect and not the window...

[vlc] / modules / access / dshow / common.h

diff --git a/modules/access/dshow/common.h b/modules/access/dshow/common.h
index e0d74b585f33842718bd6eebf3c68b072bcb65e4..6a3f2b5ea22a3c1fb09f567f767a658782e88026 100644 (file)
--- a/modules/access/dshow/common.h
+++ b/modules/access/dshow/common.h
@@ -24,8 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#undef size_t
-#undef ptrdiff_t
 #include <string>
 #include <list>
 #include <deque>
@@ -43,7 +41,9 @@ using namespace std;
 #   define AM_NOVTABLE
 #   define _OBJBASE_H_
 #   undef _X86_
-#   define _I64_MAX LONG_LONG_MAX
+#   ifndef _I64_MAX
+#     define _I64_MAX LONG_LONG_MAX
+#   endif
 #   define LONGLONG long long
 #endif
 
@@ -95,5 +95,5 @@ struct access_sys_t
     int            i_width;
     int            i_height;
     int            i_chroma;
-    vlc_bool_t     b_chroma; /* Force a specific chroma on the dshow input */
+    bool           b_chroma; /* Force a specific chroma on the dshow input */
 };