[MPlayer-cvslog] r31530 - in trunk/osdep: timer-darwin.c timer-linux.c timer-win2.c timer.h

[diego]

Author: diego
Date: Wed Jun 23 12:50:55 2010
New Revision: 31530

Log:
Change timer_name type from char* to char[]; patch taken from Uoti's tree.

Modified:
   trunk/osdep/timer-darwin.c
   trunk/osdep/timer-linux.c
   trunk/osdep/timer-win2.c
   trunk/osdep/timer.h

Modified: trunk/osdep/timer-darwin.c
==============================================================================
--- trunk/osdep/timer-darwin.c	Wed Jun 23 12:47:48 2010	(r31529)
+++ trunk/osdep/timer-darwin.c	Wed Jun 23 12:50:55 2010	(r31530)
@@ -30,7 +30,7 @@
 static double relative_time;
 static double timebase_ratio;
 
-const char *timer_name = "Darwin accurate";
+const char timer_name[] = "Darwin accurate";
 
 
 

Modified: trunk/osdep/timer-linux.c
==============================================================================
--- trunk/osdep/timer-linux.c	Wed Jun 23 12:47:48 2010	(r31529)
+++ trunk/osdep/timer-linux.c	Wed Jun 23 12:50:55 2010	(r31530)
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "timer.h"
 
-const char *timer_name =
+const char timer_name[] =
 #ifdef HAVE_NANOSLEEP
     "nanosleep()";
 #else

Modified: trunk/osdep/timer-win2.c
==============================================================================
--- trunk/osdep/timer-win2.c	Wed Jun 23 12:47:48 2010	(r31529)
+++ trunk/osdep/timer-win2.c	Wed Jun 23 12:50:55 2010	(r31530)
@@ -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)

Modified: trunk/osdep/timer.h
==============================================================================
--- trunk/osdep/timer.h	Wed Jun 23 12:47:48 2010	(r31529)
+++ trunk/osdep/timer.h	Wed Jun 23 12:50:55 2010	(r31530)
@@ -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);