Diff for /embedaddon/sudo/include/gettext.h between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 16:23:02 version 1.1.1.2, 2012/10/09 09:29:52
Line 21 Line 21
  * Solaris locale.h includes libintl.h which causes problems when we   * Solaris locale.h includes libintl.h which causes problems when we
  * redefine the gettext functions.  We include it first to avoid this.   * redefine the gettext functions.  We include it first to avoid this.
  */   */
#if defined(HAVE_LOCALE_H) && defined(__sun__) && defined(__svr4__)#if defined(HAVE_SETLOCALE) && defined(__sun__) && defined(__svr4__)
 # include <locale.h>  # include <locale.h>
 #endif  #endif
   
Line 41 Line 41
 #  undef ngettext  #  undef ngettext
 #  define ngettext(String, String_Plural, N) \  #  define ngettext(String, String_Plural, N) \
     dngettext(DEFAULT_TEXT_DOMAIN, String, String_Plural, N)      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  # endif
   
 /* Gettext convenience macros */  /* Gettext convenience macros */

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>