projects
/
debian
/
sudo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 1.8.7
[debian/sudo]
/
include
/
gettext.h
diff --git
a/include/gettext.h
b/include/gettext.h
index 27f079617b006a880fc6df6ac57538044a078c30..8f87bcd1a303b37e9958d7960380c380e5f80845 100644
(file)
--- a/
include/gettext.h
+++ b/
include/gettext.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2011 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 2011
-2012
Todd C. Miller <Todd.Miller@courtesan.com>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@
-21,9
+21,7
@@
* Solaris locale.h includes libintl.h which causes problems when we
* redefine the gettext functions. We include it first to avoid this.
*/
* Solaris locale.h includes libintl.h which causes problems when we
* redefine the gettext functions. We include it first to avoid this.
*/
-#if defined(HAVE_LOCALE_H) && defined(__sun__) && defined(__svr4__)
-# include <locale.h>
-#endif
+#include <locale.h>
#ifdef HAVE_LIBINTL_H
#ifdef HAVE_LIBINTL_H
@@
-43,6
+41,15
@@
dngettext(DEFAULT_TEXT_DOMAIN, String, String_Plural, N)
# endif
dngettext(DEFAULT_TEXT_DOMAIN, String, String_Plural, N)
# endif
+/*
+ * Older versions of Solaris lack ngettext() so we have to kludge it.
+ */
+# ifndef HAVE_NGETTEXT
+# undef ngettext
+# define ngettext(String, String_Plural, N) \
+ ((N) == 1 ? gettext(String) : gettext(String_Plural))
+# endif
+
/* Gettext convenience macros */
# define _(String) gettext(String)
# define gettext_noop(String) String
/* Gettext convenience macros */
# define _(String) gettext(String)
# define gettext_noop(String) String