Update of /cvsroot/xine/gnome-xine/include
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12988/include
Modified Files:
cset_id.sh i18n.h
Log Message:
Resync with hg (cset 1907).
Index: cset_id.sh
===================================================================
RCS file: /cvsroot/xine/gnome-xine/include/cset_id.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cset_id.sh 17 Dec 2006 01:14:51 -0000 1.1
+++ cset_id.sh 27 Feb 2007 18:03:50 -0000 1.2
@@ -1,9 +1,10 @@
#! /bin/sh
test "$1" = '' || cd "$1"
+PWD="`pwd`"
if test -d .hg; then
- HG_ID="$(hg id 2>/dev/null | cut -d' ' -f1)"
-elif expr "$(basename "$(pwd)")" : 'gxine-[[0123456789abcdef]]\{12\}$$'
>/dev/null; then
- HG_ID="$(pwd | sed -e 's/^.*gxine-//')"
+ HG_ID="`hg id 2>/dev/null | cut -d' ' -f1`"
+elif expr "`basename $PWD`" : 'gxine-[[0123456789abcdef]]\{12\}$$' >/dev/null;
then
+ HG_ID="`echo $PWD | sed -e 's/^.*gxine-//'`"
fi
# extra quoting is needed for $(...) in makefile
HG_ID="#define CSET_ID \\\"${HG_ID+ }$HG_ID\\\""
Index: i18n.h
===================================================================
RCS file: /cvsroot/xine/gnome-xine/include/i18n.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- i18n.h 3 Feb 2007 15:26:20 -0000 1.5
+++ i18n.h 27 Feb 2007 18:03:50 -0000 1.6
@@ -32,6 +32,9 @@
# endif
#else
/* Stubs that do something close enough. */
+/* Make sure we don't duplicate xine-lib's versions of these macros */
+#ifndef HAVE_XINEINTL_H
+#define HAVE_XINEINTL_H
# define textdomain(String) (String)
# define gettext(String) (String)
# define dgettext(Domain,Message) (Message)
@@ -44,6 +47,8 @@
# define dncgettext(Domain,Singular,Plural,N,Type) \
((N) == 1 ? (Singular) : (Plural))
# define bind_textdomain_codeset(Domain,Codeset) ((Codeset))
+#endif
+
# define _(String) (String)
# define N_(String) (String)
#endif
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
