summaryrefslogtreecommitdiffstats
path: root/osdep
diff options
context:
space:
mode:
authorrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-09 14:08:03 +0000
committerrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-09 14:08:03 +0000
commite7db4ccf1afbb6653ae1aae44b1c96c724361985 (patch)
tree9cc7321a75460de67bd0dae4e940b73439a1374b /osdep
parent1f34ddefd2546a37c6efe4fcd9ea3f7627af4a5d (diff)
downloadmpv-e7db4ccf1afbb6653ae1aae44b1c96c724361985.tar.bz2
mpv-e7db4ccf1afbb6653ae1aae44b1c96c724361985.tar.xz
Patch by Stefan Huehner / stefan % huehner ! org \
patch replaces '()' for the correct '(void)' in function declarations/prototypes which have no parameters. The '()' syntax tell thats there is a variable list of arguments, so that the compiler cannot check this. The extra CFLAG '-Wstrict-declarations' shows those cases. Comments about a similar patch applied to ffmpeg: That in C++ these mean the same, but in ANSI C the semantics are different; function() is an (obsolete) K&R C style forward declaration, it basically means that the function can have any number and any types of parameters, effectively completely preventing the compiler from doing any sort of type checking. -- Erik Slagter Defining functions with unspecified arguments is allowed but bad. With arguments unspecified the compiler can't report an error/warning if the function is called with incorrect arguments. -- Måns Rullgård git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17567 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'osdep')
-rw-r--r--osdep/getch2.c6
-rw-r--r--osdep/getch2.h6
-rw-r--r--osdep/timer-lx.c8
-rw-r--r--osdep/timer.h8
4 files changed, 14 insertions, 14 deletions
diff --git a/osdep/getch2.c b/osdep/getch2.c
index 4c40b055c6..32cd74f033 100644
--- a/osdep/getch2.c
+++ b/osdep/getch2.c
@@ -118,7 +118,7 @@ int load_termcap(char *termtype){
#endif
-void get_screen_size(){
+void get_screen_size(void){
#ifdef USE_IOCTL
struct winsize ws;
if (ioctl(0, TIOCGWINSZ, &ws) < 0 || !ws.ws_row || !ws.ws_col) return;
@@ -217,7 +217,7 @@ found:
static int getch2_status=0;
-void getch2_enable(){
+void getch2_enable(void){
#ifdef HAVE_TERMIOS
struct termios tio_new;
#if defined(__NetBSD__) || defined(__svr4__) || defined(__CYGWIN__) || defined(__OS2__) || defined(__GLIBC__) || defined(_AIX)
@@ -242,7 +242,7 @@ struct termios tio_new;
getch2_status=1;
}
-void getch2_disable(){
+void getch2_disable(void){
if(!getch2_status) return; // already disabled / never enabled
#ifdef HAVE_TERMIOS
#if defined(__NetBSD__) || defined(__svr4__) || defined(__CYGWIN__) || defined(__OS2__) || defined(__GLIBC__) || defined(_AIX)
diff --git a/osdep/getch2.h b/osdep/getch2.h
index 49743f2ecf..75bf463cc1 100644
--- a/osdep/getch2.h
+++ b/osdep/getch2.h
@@ -9,14 +9,14 @@ extern int screen_height;
extern char * erase_to_end_of_line;
/* Get screen-size using IOCTL call. */
-extern void get_screen_size();
+extern void get_screen_size(void);
/* Load key definitions from the TERMCAP database. 'termtype' can be NULL */
extern int load_termcap(char *termtype);
/* Enable and disable STDIN line-buffering */
-extern void getch2_enable();
-extern void getch2_disable();
+extern void getch2_enable(void);
+extern void getch2_disable(void);
/* Read a character or a special key code (see keycodes.h) */
extern int getch2(int halfdelay_time);
diff --git a/osdep/timer-lx.c b/osdep/timer-lx.c
index 104cd97391..10f95be54b 100644
--- a/osdep/timer-lx.c
+++ b/osdep/timer-lx.c
@@ -29,7 +29,7 @@ int usec_sleep(int usec_delay)
}
// Returns current time in microseconds
-unsigned int GetTimer(){
+unsigned int GetTimer(void){
struct timeval tv;
struct timezone tz;
// float s;
@@ -39,7 +39,7 @@ unsigned int GetTimer(){
}
// Returns current time in milliseconds
-unsigned int GetTimerMS(){
+unsigned int GetTimerMS(void){
struct timeval tv;
struct timezone tz;
// float s;
@@ -51,7 +51,7 @@ unsigned int GetTimerMS(){
static unsigned int RelativeTime=0;
// Returns time spent between now and last call in seconds
-float GetRelativeTime(){
+float GetRelativeTime(void){
unsigned int t,r;
t=GetTimer();
// t*=16;printf("time=%ud\n",t);
@@ -61,7 +61,7 @@ unsigned int t,r;
}
// Initialize timer, must be called at least once at start
-void InitTimer(){
+void InitTimer(void){
GetRelativeTime();
}
diff --git a/osdep/timer.h b/osdep/timer.h
index 1e181650c1..c45ebc754b 100644
--- a/osdep/timer.h
+++ b/osdep/timer.h
@@ -3,11 +3,11 @@
extern const char *timer_name;
-void InitTimer();
-unsigned int GetTimer();
-unsigned int GetTimerMS();
+void InitTimer(void);
+unsigned int GetTimer(void);
+unsigned int GetTimerMS(void);
//int uGetTimer();
-float GetRelativeTime();
+float GetRelativeTime(void);
int usec_sleep(int usec_delay);