Merge svn change r30560

2 files changed, 5 insertions, 5 deletions

diff --git a/mp_core.h b/mp_core.h
index bd8a4aee99..5c0b48d285 100644
--- a/mp_core.h
+++ b/mp_core.h
@@ -58,12 +58,12 @@ enum stop_play_reason {
     PT_STOP,
 };
 
-typedef enum {
+enum exit_reason {
   EXIT_NONE,
   EXIT_QUIT,
   EXIT_EOF,
   EXIT_ERROR
-} exit_reason_t;
+};
 
 struct content_source {
     struct stream *stream;
@@ -203,7 +203,7 @@ void uninit_player(struct MPContext *mpctx, unsigned int mask);
 void reinit_audio_chain(struct MPContext *mpctx);
 void init_vo_spudec(struct MPContext *mpctx);
 double playing_audio_pts(struct MPContext *mpctx);
-void exit_player_with_rc(struct MPContext *mpctx, exit_reason_t how, int rc);
+void exit_player_with_rc(struct MPContext *mpctx, enum exit_reason how, int rc);
 void add_subtitles(struct MPContext *mpctx, char *filename, float fps, int noerr);
 int reinit_video_chain(struct MPContext *mpctx);
 void pause_player(struct MPContext *mpctx);
diff --git a/mplayer.c b/mplayer.c
index 9eff2c16d7..e158011bab 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -726,7 +726,7 @@ void uninit_player(struct MPContext *mpctx, unsigned int mask){
   current_module=NULL;
 }
 
-void exit_player_with_rc(struct MPContext *mpctx, exit_reason_t how, int rc)
+void exit_player_with_rc(struct MPContext *mpctx, enum exit_reason how, int rc)
 {
   if (mpctx->user_muted && !mpctx->edl_muted) mixer_mute(&mpctx->mixer);
   uninit_player(mpctx, INITIALIZED_ALL);
@@ -798,7 +798,7 @@ void exit_player_with_rc(struct MPContext *mpctx, exit_reason_t how, int rc)
   exit(rc);
 }
 
-static void exit_player(struct MPContext *mpctx, exit_reason_t how)
+static void exit_player(struct MPContext *mpctx, enum exit_reason how)
 {
   exit_player_with_rc(mpctx, how, 1);
 }