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

version 1.1.1.2, 2012/10/09 09:29:52 version 1.1.1.4, 2014/06/15 16:12:54
Line 1 Line 1
 /*  /*
 * 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   * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above   * purpose with or without fee is hereby granted, provided that the above
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_SETLOCALE) && defined(__sun__) && defined(__svr4__)#include <locale.h>
# include <locale.h> 
#endif 
   
 #ifdef HAVE_LIBINTL_H  #ifdef HAVE_LIBINTL_H
   
Line 56 Line 54
 # define _(String) gettext(String)  # define _(String) gettext(String)
 # define gettext_noop(String) String  # define gettext_noop(String) String
 # define N_(String) gettext_noop(String)  # define N_(String) gettext_noop(String)
   # define U_(String) warning_gettext(String)
   
 #else /* !HAVE_LIBINTL_H */  #else /* !HAVE_LIBINTL_H */
   
Line 65 Line 64
  */   */
 # define _(String) String   # define _(String) String 
 # define N_(String) String  # define N_(String) String
   # define U_(String) String
 # define textdomain(Domain)  # define textdomain(Domain)
 # define bindtextdomain(Package, Directory)  # define bindtextdomain(Package, Directory)
 # define ngettext(String, String_Plural, N) \  # define ngettext(String, String_Plural, N) \

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


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