Pastebin launched a little side project called VERYVIRAL.com, check it out ;-) Want more features on Pastebin? Sign Up, it's FREE!
Guest

Untitled

By: a guest on Feb 4th, 2013  |  syntax: None  |  size: 1.55 KB  |  views: 26  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_internal.h b/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_internal.h
  2. index 4461ef5..77fc009 100644
  3. --- a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_internal.h
  4. +++ b/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_internal.h
  5. @@ -32,7 +32,7 @@
  6.  #include <string.h>
  7.  
  8.  #ifdef WIN32
  9. -
  10. +#ifndef _LINUX
  11.  /* pthread_mutex_* wrapper for win32 */
  12.  #include <windows.h>
  13.  #include <process.h>
  14. @@ -40,6 +40,7 @@ typedef CRITICAL_SECTION pthread_mutex_t;
  15.  #define pthread_mutex_init(a, b) InitializeCriticalSection(a)
  16.  #define pthread_mutex_lock(a)    EnterCriticalSection(a)
  17.  #define pthread_mutex_unlock(a)  LeaveCriticalSection(a)
  18. +#endif
  19.  #define pthread_mutex_destroy(a) DeleteCriticalSection(a)
  20.  
  21.  #ifndef HAVE_GETTIMEOFDAY
  22. @@ -56,7 +57,10 @@ static inline int _private_gettimeofday( struct timeval *tv, void *tz )
  23.  #define gettimeofday(TV, TZ) _private_gettimeofday((TV), (TZ))
  24.  #endif
  25.  
  26. +#ifndef _LINUX
  27.  #include <io.h> /* read() */
  28. +#endif
  29. +
  30.  #define lseek64 _lseeki64
  31.  
  32.  #else
  33. @@ -193,12 +197,12 @@ int64_t dvdnav_convert_time(dvd_time_t *time);
  34.  /*
  35.   * Get current playback state
  36.   */
  37. -dvdnav_status_t dvdnav_get_state(dvdnav_t *this, dvd_state_t *save_state);
  38. +dvdnav_status_t dvdnav_get_state(dvdnav_t *me, dvd_state_t *save_state);
  39.  
  40.  /*
  41.   * Resume playback state
  42.   */
  43. -dvdnav_status_t dvdnav_set_state(dvdnav_t *this, dvd_state_t *save_state);
  44. +dvdnav_status_t dvdnav_set_state(dvdnav_t *me, dvd_state_t *save_state);
  45.  /* end XBMC */
  46.  
  47.  /** USEFUL MACROS **/