* Grmbl. Forgot to commit those Win32 fixes last time, and they were

    stuck on VTHR. Sorry xav, this probably explains why I couldn't
    find the commit log :-)

diff --git a/include/common.h b/include/common.h
index d3f55a77ed235f528a9f8be82a90af6065362cc0..27bdd83af3eb2e3be85741b2e721b089a860a187 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -3,7 +3,7 @@
  * Collection of useful common types and macros definitions
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: common.h,v 1.71 2002/01/29 20:11:18 gbazin Exp $
+ * $Id: common.h,v 1.72 2002/02/14 23:29:17 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -428,8 +428,6 @@ typedef __int64 off_t;
 #else
 #   define _(String) (String)
 #   define N_(String) (String)
-#   define textdomain(Domain)
-#   define bindtextdomain(Package, Directory) 1
 #endif
 
 /*****************************************************************************

diff --git a/plugins/gtk/fixfiles.sh b/plugins/gtk/fixfiles.sh
index 6917fda41057edc155976b0430ee98b077d254af..568c76f4bdab616398761f605f9a2940b6e96f96 100755 (executable)
--- a/plugins/gtk/fixfiles.sh
+++ b/plugins/gtk/fixfiles.sh
@@ -19,3 +19,12 @@ EOF
                 mv -f /tmp/$$.$file.bak $file
         fi
 done
+
+file=gtk_support.h
+if grep -q "DO NOT EDIT THIS FILE" $file
+then
+       rm -f /tmp/$$.$file.bak
+       sed 's/DO NOT EDIT THIS FILE.*/This file was created automatically by glade and fixed by fixfiles.sh/ ; s/#if.*ENABLE_NLS.*/#if defined( ENABLE_NLS ) \&\& defined ( HAVE_GETTEXT )/' < $file > /tmp/$$.$file.bak
+       mv -f /tmp/$$.$file.bak $file
+fi
+

diff --git a/plugins/gtk/gtk_playlist.c b/plugins/gtk/gtk_playlist.c
index 2edefd3b720aa4890ce08a62cb8467b7b3b7c53a..471388fadb1c192012c51bbed749df9c88f015f5 100644 (file)
--- a/plugins/gtk/gtk_playlist.c
+++ b/plugins/gtk/gtk_playlist.c
@@ -2,7 +2,7 @@
  * gtk_playlist.c : Interface for the playlist dialog
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: gtk_playlist.c,v 1.27 2002/01/17 23:02:45 gbazin Exp $
+ * $Id: gtk_playlist.c,v 1.28 2002/02/14 23:29:17 sam Exp $
  *
  * Authors: Pierre Baillet <oct@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -32,10 +32,6 @@
 
 #include <sys/types.h>          /* for readdir  and stat stuff */
 
-#if !defined( _MSC_VER )
-#   include <dirent.h>
-#endif
-
 #include <sys/stat.h>
 #include <unistd.h>
 

diff --git a/plugins/gtk/gtk_support.h b/plugins/gtk/gtk_support.h
index 931bc5ad044272247cf4b79ec94d43dc47e3727e..17b71ecdecaa005c67a0893f7e96fa5c9fef8504 100644 (file)
--- a/plugins/gtk/gtk_support.h
+++ b/plugins/gtk/gtk_support.h
@@ -1,5 +1,5 @@
 /*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
+ * This file was created automatically by glade and fixed by fixfiles.sh
  */
 
 #ifdef HAVE_CONFIG_H
@@ -11,7 +11,7 @@
 /*
  * Standard gettext macros.
  */
-#ifdef ENABLE_NLS
+#if defined( ENABLE_NLS ) && defined ( HAVE_GETTEXT )
 #  include <libintl.h>
 #  undef _
 #  define _(String) dgettext (PACKAGE, String)

diff --git a/src/interface/main.c b/src/interface/main.c
index 61433a4f7a9f564dbe3a9e191c11c72c94efdc4c..be0a77dbae594c7e550543ddd516699cd10fb2c5 100644 (file)
--- a/src/interface/main.c
+++ b/src/interface/main.c
@@ -4,7 +4,7 @@
  * and spawn threads.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: main.c,v 1.149 2002/02/13 22:10:40 sam Exp $
+ * $Id: main.c,v 1.150 2002/02/14 23:29:17 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -281,7 +281,7 @@ int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
     p_aout_bank   = &aout_bank;
     p_vout_bank   = &vout_bank;
 
-#ifdef ENABLE_NLS
+#if defined( ENABLE_NLS ) && defined ( HAVE_GETTEXT )
     /*
      * Support for getext
      */