From c693b77e935e7e34e21bafed2df0ff891d0e25ac Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Mon, 28 Apr 2008 11:25:49 +0300 Subject: osdep: Change timer_name to a saner type timer_name was a (non-const) pointer to a const char array. Make the symbol the array itself. --- osdep/timer-darwin.c | 2 +- osdep/timer-linux.c | 2 +- osdep/timer-win2.c | 2 +- osdep/timer.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'osdep') diff --git a/osdep/timer-darwin.c b/osdep/timer-darwin.c index 68029d1fdc..38de7dea9d 100644 --- a/osdep/timer-darwin.c +++ b/osdep/timer-darwin.c @@ -30,7 +30,7 @@ static double relative_time, startup_time; static double timebase_ratio; -const char *timer_name = "Darwin accurate"; +const char timer_name[] = "Darwin accurate"; diff --git a/osdep/timer-linux.c b/osdep/timer-linux.c index 579c284019..27e245c850 100644 --- a/osdep/timer-linux.c +++ b/osdep/timer-linux.c @@ -9,7 +9,7 @@ #include #include "config.h" -const char *timer_name = +const char timer_name[] = #ifdef HAVE_NANOSLEEP "nanosleep()"; #else diff --git a/osdep/timer-win2.c b/osdep/timer-win2.c index 2f0b5c3075..ef52a665d3 100644 --- a/osdep/timer-win2.c +++ b/osdep/timer-win2.c @@ -4,7 +4,7 @@ #include #include "timer.h" -const char *timer_name = "Windows native"; +const char timer_name[] = "Windows native"; // Returns current time in microseconds unsigned int GetTimer(){ diff --git a/osdep/timer.h b/osdep/timer.h index f0e87a89b7..44e26cdafc 100644 --- a/osdep/timer.h +++ b/osdep/timer.h @@ -1,7 +1,7 @@ #ifndef MPLAYER_TIMER_H #define MPLAYER_TIMER_H -extern const char *timer_name; +extern const char timer_name[]; void InitTimer(void); unsigned int GetTimer(void); -- cgit v1.2.3