[BACK]Return to libintl.h CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / lib / libintl

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/lib/libintl/libintl.h between version 1.7 and 1.8

version 1.7, 2015/06/08 15:02:33 version 1.8, 2015/06/08 15:04:20
Line 31 
Line 31 
   
 #include <sys/cdefs.h>  #include <sys/cdefs.h>
   
   #ifndef _LIBGETTEXT_H
   /*
    * Avoid defining these if the GNU gettext compatibility header includes
    * us, since it re-defines those unconditionally and creates inline functions
    * for some of them. This is horrible.
    */
   #define pgettext_expr(msgctxt, msgid) pgettext((msgctxt), (msgid))
   #define dpgettext_expr(domainname, msgctxt, msgid) \
       dpgettext((domainname), (msgctxt), (msgid))
   #define dcpgettext_expr(domainname, msgctxt, msgid, category) \
       dcpgettext((domainname), (msgctxt), (msgid), (category))
   #define npgettext_expr(msgctxt, msgid1, msgid2, n) \
       npgettext((msgctxt), (msgid1), (msgid2), (n))
   #define dnpgettext_expr(domainname, msgctxt, msgid1, n) \
       dnpgettext((domainname), (msgctxt), (msgid1), (msgid2), (n))
   #define dcnpgettext_expr(domainname, msgctxt, msgid1, msgid2, n, category) \
       dcnpgettext((domainname), (msgctxt), (msgid1), (msgid2), (n), (category))
   #endif
   
 __BEGIN_DECLS  __BEGIN_DECLS
 char *gettext(const char *) __format_arg(1);  char *gettext(const char *) __format_arg(1);
Line 60  char *textdomain(const char *);
Line 78  char *textdomain(const char *);
 char *bindtextdomain(const char *, const char *);  char *bindtextdomain(const char *, const char *);
 char *bind_textdomain_codeset(const char *, const char *);  char *bind_textdomain_codeset(const char *, const char *);
   
 #ifndef _LIBGETTEXT_H  
 /*  
  * Avoid defining these if the GNU gettext compatibility header includes  
  * us, since it re-defines those unconditionally and creates inline functions  
  * for some of them. This is horrible.  
  */  
 static __inline __format_arg(2) const char *  
 pgettext_expr(const char *_msgctxt, const char *_msgid)  
 {  
         return pgettext(_msgctxt, _msgid);  
 }  
   
 static __inline __format_arg(3) const char *  
 dpgettext_expr(const char *_domainname, const char *_msgctxt,  
     const char *_msgid)  
 {  
         return dpgettext(_domainname, _msgctxt, _msgid);  
 }  
   
 static __inline __format_arg(3) const char *  
 dcpgettext_expr(const char *_domainname, const char *_msgctxt,  
     const char *_msgid, int _category)  
 {  
         return dcpgettext(_domainname, _msgctxt, _msgid, _category);  
 }  
   
 static __inline __format_arg(2) __format_arg(3) const char *  
 npgettext_expr(const char *_msgctx, const char *_msgid1, const char *_msgid2,  
     long int _n)  
 {  
         return npgettext(_msgctx, _msgid1, _msgid2, _n);  
 }  
   
 static __inline __format_arg(3) __format_arg(4) const char *  
 dnpgettext_expr(const char *_domainname, const char *_msgctx,  
     const char *_msgid1, const char *_msgid2, long int _n)  
 {  
         return dnpgettext(_domainname, _msgctx, _msgid1, _msgid2, _n);  
 }  
   
 static __inline __format_arg(3) __format_arg(4) const char *  
 dcnpgettext_expr(const char *_domainname, const char *_msgctx,  
     const char *_msgid1, const char *_msgid2, long int _n, int _category)  
 {  
         return dcnpgettext(_domainname, _msgctx, _msgid1, _msgid2, _n,  
             _category);  
 }  
 #endif /* _LIBGETTEXT_H */  
   
 __END_DECLS  __END_DECLS
   
 #endif /* _LIBINTL_H_ */  #endif /* _LIBINTL_H_ */

Legend:
Removed from v.1.7  
changed lines
  Added in v.1.8

CVSweb <webmaster@jp.NetBSD.org>