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.

2 files changed, 11 insertions, 6 deletions

diff --git a/osdep/getch2-win.c b/osdep/getch2-win.c
index 49ec9c46b3..a1c5601474 100644
--- a/osdep/getch2-win.c
+++ b/osdep/getch2-win.c
@@ -31,7 +31,7 @@ int screen_width=80;
 int screen_height=24;
 char * erase_to_end_of_line = NULL;
 
-void get_screen_size(){
+void get_screen_size(void){
 }
 
 static HANDLE stdin;
@@ -128,7 +128,8 @@ void getch2(struct mp_fifo *fifo)
 	mplayer_put_key(fifo, r);
 }
 
-void getch2_enable(){
+void getch2_enable(void)
+{
 	DWORD retval;
     stdin = GetStdHandle(STD_INPUT_HANDLE);
    	if(!GetNumberOfConsoleInputEvents(stdin,&retval))
@@ -139,7 +140,8 @@ void getch2_enable(){
     else getch2_status=1;
 }
 
-void getch2_disable(){
+void getch2_disable(void)
+{
     if(!getch2_status) return; // already disabled / never enabled
     getch2_status=0;
 }
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)
+{
 }