Mercurial > mplayer.hg

changeset 31464:1453fc56d49c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change timer_name type from char* to char[]; patch taken from Uoti's tree.
author diego
date Wed, 23 Jun 2010 10:50:55 +0000
parents f6381d990cf3
children 65a4a8ddb552
files osdep/timer-darwin.c osdep/timer-linux.c osdep/timer-win2.c osdep/timer.h
diffstat 4 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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";
 
 
 
--- 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
--- 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 <mmsystem.h>
 #include "timer.h"
 
-const char *timer_name = "Windows native";
+const char timer_name[] = "Windows native";
 
 // Returns current time in microseconds
 unsigned int GetTimer(void)
--- 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);