summaryrefslogtreecommitdiffstats
path: root/osdep
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-01-05 14:48:03 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-01-05 14:48:03 +0000
commit824abb5a65c1de35259818956e22a24c33f318b4 (patch)
treea81ec268f4afe16439d2ec2af0bf2d2b504c321b /osdep
parent24617c7318bb4f408a6152b3885d60bee9370fc4 (diff)
downloadmpv-824abb5a65c1de35259818956e22a24c33f318b4.tar.bz2
mpv-824abb5a65c1de35259818956e22a24c33f318b4.tar.xz
Add missing 'void' keyword to parameterless function declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28267 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'osdep')
-rw-r--r--osdep/getch2-win.c8
-rw-r--r--osdep/timer-win2.c12
2 files changed, 13 insertions, 7 deletions
diff --git a/osdep/getch2-win.c b/osdep/getch2-win.c
index 83d502f7c7..70608ea366 100644
--- a/osdep/getch2-win.c
+++ b/osdep/getch2-win.c
@@ -29,7 +29,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;
@@ -126,7 +126,8 @@ void getch2(void)
mplayer_put_key(r);
}
-void getch2_enable(){
+void getch2_enable(void)
+{
DWORD retval;
stdin = GetStdHandle(STD_INPUT_HANDLE);
if(!GetNumberOfConsoleInputEvents(stdin,&retval))
@@ -137,7 +138,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 2f0b5c3075..fabac2e81f 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(voi)
+{
return timeGetTime() ;
}
@@ -27,7 +29,8 @@ int usec_sleep(int usec_delay){
static DWORD RelativeTime = 0;
-float GetRelativeTime(){
+float GetRelativeTime(void)
+{
DWORD t, r;
t = GetTimer();
r = t - RelativeTime;
@@ -35,6 +38,7 @@ float GetRelativeTime(){
return (float) r *0.000001F;
}
-void InitTimer(){
+void InitTimer(void)
+{
GetRelativeTime();
}