* src/video_output/vout_subpictures.c: fixed a few race conditions that

[vlc] / include / vlc_common.h

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 77be3b1cb19c0051855f7846f1f85057df6b9e49..465ed776ce5753c52cbcda41e478aea8c0067190 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -3,7 +3,7 @@
  * Collection of useful common types and macros definitions
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vlc_common.h,v 1.49 2003/01/27 22:42:36 sam Exp $
+ * $Id: vlc_common.h,v 1.52 2003/01/28 17:11:38 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -647,7 +647,10 @@ typedef __int64 off_t;
  *****************************************************************************/
 VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) );
 
-#if defined( ENABLE_NLS ) && defined( HAVE_INCLUDED_GETTEXT )
+#if defined( ENABLE_NLS ) && \
+     (defined(MODULE_NAME_IS_gnome)||defined(MODULE_NAME_IS_gnome_main))
+    /* Declare nothing: gnome.h will do it for us */
+#elif defined( ENABLE_NLS ) && defined( HAVE_INCLUDED_GETTEXT )
 #   include "libintl.h"
 #   undef _
 #   define _(String) vlc_dgettext (PACKAGE, String)
@@ -657,7 +660,7 @@ VLC_EXPORT( char *, vlc_dgettext, ( const char *package, const char *msgid ) );
 #   undef _
 #   define _(String) dgettext (PACKAGE, String)
 #   define N_(String) ((char*)(String))
-#elif !defined( NEED_GNOMESUPPORT_H )
+#else
 #   define _(String) ((char*)(String))
 #   define N_(String) ((char*)(String))
 #endif