# HG changeset patch
# User diego
# Date 1203363479 0
# Node ID a9e86b2def645cfb31597e1f5a4c1dc7ddfe62c2
# Parent  ccdb4a59d00f88090dbba7d1aace2ab3310b6880
Merge the two conditional definitions of get_current_dir_name.

diff -r ccdb4a59d00f -r a9e86b2def64 gui/mplayer/gtk/fs.c
--- a/gui/mplayer/gtk/fs.c	Mon Feb 18 16:33:31 2008 +0000
+++ b/gui/mplayer/gtk/fs.c	Mon Feb 18 19:37:59 2008 +0000
@@ -25,9 +25,7 @@
 
 #ifndef __linux__
 #define get_current_dir_name()  getcwd(NULL, PATH_MAX)
-#endif
-
-#ifndef get_current_dir_name
+#else
  extern char * get_current_dir_name( void );
 #endif