Merge svn changes up to r28310

The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.

1 files changed, 6 insertions, 3 deletions

diff --git a/osdep/timer-win2.c b/osdep/timer-win2.c
index 43c4b07fa9..3c6b86afa4 100644
--- a/osdep/timer-win2.c
+++ b/osdep/timer-win2.c
@@ -7,12 +7,14 @@
 const char timer_name[] = "Windows native";
 
 // Returns current time in microseconds
-unsigned int GetTimer(){
+unsigned int GetTimer(void)
+{
   return timeGetTime() * 1000;
 }
 
 // Returns current time in milliseconds
-unsigned int GetTimerMS(){
+unsigned int GetTimerMS(void)
+{
   return timeGetTime() ;
 }
 
@@ -25,5 +27,6 @@ int usec_sleep(int usec_delay){
   return 0;
 }
 
-void InitTimer(){
+void InitTimer(void)
+{
 }