Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Hack up dcgettext to try to fix CentOS build

Browse source 
https://github.com/fish-shell/fish-shell/issues/645
This commit is contained in:
ridiculousfish 2013-04-08 12:02:43 -07:00
parent b936be8e34
commit 8bbd8ab073
3 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
env.cpp
View file

@ -357,7 +357,7 @@ static void handle_locale()
extern int _nl_msg_cat_cntr; extern int _nl_msg_cat_cntr;
_nl_msg_cat_cntr++; _nl_msg_cat_cntr++;
dcgettext("fish", "Changing language to English", LC_MESSAGES); fish_dcgettext("fish", "Changing language to English", LC_MESSAGES);
if (get_is_interactive()) if (get_is_interactive())
{ {

19
fallback.cpp
View file

@ -1141,28 +1141,33 @@ char * fish_textdomain(const char * domainname)
#else #else
char * fish_gettext(const char * msgid) char *fish_gettext(const char * msgid)
{ {
return (char *)msgid; return (char *)msgid;
} }
char * fish_bindtextdomain(const char * domainname, const char * dirname) char *fish_bindtextdomain(const char * domainname, const char * dirname)
{ {
return NULL; return NULL;
} }
char * fish_textdomain(const char * domainname) char *fish_textdomain(const char * domainname)
{ {
return NULL; return NULL;
} }
#endif #endif
#ifndef HAVE_DCGETTEXT #if HAVE_DCGETTEXT
char * dcgettext(const char * domainname, char *fish_dcgettext(const char * domainname, const char * msgid, int category)
const char * msgid, {
int category) return dcgettext(msgid);
}
#else
char *fish_dcgettext(const char * domainname, const char * msgid, int category)
{ {
return (char *)msgid; return (char *)msgid;
} }

18
fallback.h
View file

@ -389,25 +389,17 @@ int futimes(int fd, const struct timeval *times);
/* autoconf may fail to detect gettext (645), so don't define a function call gettext or we'll get build errors */ /* autoconf may fail to detect gettext (645), so don't define a function call gettext or we'll get build errors */
/** Fallback implementation of gettext. Just returns the original string. */ /** Cover for gettext() */
char * fish_gettext(const char * msgid); char * fish_gettext(const char * msgid);
/** Fallback implementation of bindtextdomain. Does nothing. */ /** Cover for bindtextdomain() */
char * fish_bindtextdomain(const char * domainname, const char * dirname); char * fish_bindtextdomain(const char * domainname, const char * dirname);
/** Fallback implementation of textdomain. Does nothing. */ /** Cover for textdomain() */
char * fish_textdomain(const char * domainname); char * fish_textdomain(const char * domainname);
#ifndef HAVE_DCGETTEXT /* Cover for dcgettext */
char * fish_dcgettext(const char * domainname, const char * msgid, int category);
/**
Fallback implementation of dcgettext. Just returns the original string.
*/
char * dcgettext(const char * domainname,
const char * msgid,
int category);
#endif
#ifndef HAVE__NL_MSG_CAT_CNTR #ifndef HAVE__NL_MSG_CAT_CNTR