summaryrefslogtreecommitdiffstats
path: root/osdep
diff options
context:
space:
mode:
Diffstat (limited to 'osdep')
-rw-r--r--osdep/getch2-win.c2
-rw-r--r--osdep/shmem.c2
-rw-r--r--osdep/timer-linux.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/osdep/getch2-win.c b/osdep/getch2-win.c
index 03c3d42cbf..940fb5a03f 100644
--- a/osdep/getch2-win.c
+++ b/osdep/getch2-win.c
@@ -99,7 +99,7 @@ static int getch2_internal(void)
}
/*check for function keys*/
if(0x87 >= eventbuffer[i].Event.KeyEvent.wVirtualKeyCode && eventbuffer[i].Event.KeyEvent.wVirtualKeyCode >= 0x70)
- return (KEY_F + 1 + eventbuffer[i].Event.KeyEvent.wVirtualKeyCode - 0x70);
+ return KEY_F + 1 + eventbuffer[i].Event.KeyEvent.wVirtualKeyCode - 0x70;
/*only characters should be remaining*/
//printf("getch2: YOU PRESSED \"%c\" \n",eventbuffer[i].Event.KeyEvent.uChar.AsciiChar);
diff --git a/osdep/shmem.c b/osdep/shmem.c
index 24e3310ccb..378512b38b 100644
--- a/osdep/shmem.c
+++ b/osdep/shmem.c
@@ -82,7 +82,7 @@ while(1){
return p;
#else
mp_msg(MSGT_OSDEP, MSGL_FATAL, "shmem: no SHM support was compiled in!\n");
- return(NULL);
+ return NULL;
#endif
}
default:
diff --git a/osdep/timer-linux.c b/osdep/timer-linux.c
index 579c284019..cab110927a 100644
--- a/osdep/timer-linux.c
+++ b/osdep/timer-linux.c
@@ -34,7 +34,7 @@ unsigned int GetTimer(void){
// float s;
gettimeofday(&tv,NULL);
// s=tv.tv_usec;s*=0.000001;s+=tv.tv_sec;
- return (tv.tv_sec*1000000+tv.tv_usec);
+ return tv.tv_sec * 1000000 + tv.tv_usec;
}
// Returns current time in milliseconds
@@ -43,7 +43,7 @@ unsigned int GetTimerMS(void){
// float s;
gettimeofday(&tv,NULL);
// s=tv.tv_usec;s*=0.000001;s+=tv.tv_sec;
- return (tv.tv_sec*1000+tv.tv_usec/1000);
+ return tv.tv_sec * 1000 + tv.tv_usec / 1000;
}
static unsigned int RelativeTime=0;