# HG changeset patch # User diego # Date 1277290255 0 # Node ID 1453fc56d49c4dee29c34dd9f86aeed78129ba44 # Parent f6381d990cf3d29af0902e91a7db58cc0e76d105 Change timer_name type from char* to char[]; patch taken from Uoti's tree. diff -r f6381d990cf3 -r 1453fc56d49c osdep/timer-darwin.c --- a/osdep/timer-darwin.c Wed Jun 23 10:47:48 2010 +0000 +++ b/osdep/timer-darwin.c Wed Jun 23 10:50:55 2010 +0000 @@ -30,7 +30,7 @@ static double relative_time; static double timebase_ratio; -const char *timer_name = "Darwin accurate"; +const char timer_name[] = "Darwin accurate"; diff -r f6381d990cf3 -r 1453fc56d49c osdep/timer-linux.c --- a/osdep/timer-linux.c Wed Jun 23 10:47:48 2010 +0000 +++ b/osdep/timer-linux.c Wed Jun 23 10:50:55 2010 +0000 @@ -29,7 +29,7 @@ #include "config.h" #include "timer.h" -const char *timer_name = +const char timer_name[] = #ifdef HAVE_NANOSLEEP "nanosleep()"; #else diff -r f6381d990cf3 -r 1453fc56d49c osdep/timer-win2.c --- a/osdep/timer-win2.c Wed Jun 23 10:47:48 2010 +0000 +++ b/osdep/timer-win2.c Wed Jun 23 10:50:55 2010 +0000 @@ -22,7 +22,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(void) diff -r f6381d990cf3 -r 1453fc56d49c osdep/timer.h --- a/osdep/timer.h Wed Jun 23 10:47:48 2010 +0000 +++ b/osdep/timer.h Wed Jun 23 10:50:55 2010 +0000 @@ -19,7 +19,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);