From b1760bdba5064c747828fae1e22352060329b378 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 6 Jan 2008 16:31:26 +0000
Subject: [PATCH] Rename common.[ch], there are too many files by that name.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25631 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 gui/Makefile                           | 2 +-
 gui/mplayer/{common.c => gui_common.c} | 0
 gui/mplayer/{common.h => gui_common.h} | 0
 gui/mplayer/mw.c                       | 2 +-
 gui/mplayer/pb.c                       | 2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename gui/mplayer/{common.c => gui_common.c} (100%)
 rename gui/mplayer/{common.h => gui_common.h} (100%)

diff --git a/gui/Makefile b/gui/Makefile
index 0cf0a85388..b2d67a334b 100644
--- a/gui/Makefile
+++ b/gui/Makefile
@@ -20,7 +20,7 @@ SRCS_MPLAYER = app.c \
                bitmap.c \
                cfg.c \
                interface.c \
-               mplayer/common.c \
+               mplayer/gui_common.c \
                mplayer/menu.c \
                mplayer/mw.c \
                mplayer/pb.c \
diff --git a/gui/mplayer/common.c b/gui/mplayer/gui_common.c
similarity index 100%
rename from gui/mplayer/common.c
rename to gui/mplayer/gui_common.c
diff --git a/gui/mplayer/common.h b/gui/mplayer/gui_common.h
similarity index 100%
rename from gui/mplayer/common.h
rename to gui/mplayer/gui_common.h
diff --git a/gui/mplayer/mw.c b/gui/mplayer/mw.c
index 1bd4a8ebd6..f68a9b2b7e 100644
--- a/gui/mplayer/mw.c
+++ b/gui/mplayer/mw.c
@@ -50,7 +50,7 @@ int             boxMoved = 0;
 int             sx = 0,sy = 0;
 int             i,pot = 0;
 
-#include "common.h"
+#include "gui_common.h"
 
 void mplMainDraw( void )
 {
diff --git a/gui/mplayer/pb.c b/gui/mplayer/pb.c
index 0a06abf9b0..93e89c3f70 100644
--- a/gui/mplayer/pb.c
+++ b/gui/mplayer/pb.c
@@ -29,7 +29,7 @@
 #include "gmplayer.h"
 #include "play.h"
 #include "widgets.h"
-#include "common.h"
+#include "gui_common.h"
 
 extern unsigned int GetTimerMS( void );
 extern unsigned int GetTimer( void );