Changeset 24533

Show
Ignore:
Timestamp:
11/21/08 02:53:22 (7 weeks ago)
Author:
saturday06
Message:

asdsafasdfaerfaerfvasdrfgvsdrfgv

Location:
lang/c/libintl-msvc
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • lang/c/libintl-msvc/libintl.h

    r24529 r24533  
    427427 
    428428WCHAR_LIBINTL_STATIC_INLINE  
    429 const wchar_t* wgettext_(const char* msgid, const wchar_t* wmsgid) 
    430 { 
    431   const char* translated = gettext(msgid); 
    432   return translated != msgid ? (const wchar_t*)translated : wmsgid; 
     429const wchar_t *wgettext_ (const char *msgid, const wchar_t *wmsgid) 
     430{ 
     431  const char *translated = gettext (msgid); 
     432  return translated != msgid ? (const wchar_t *)translated : wmsgid; 
    433433} 
    434434 
    435435WCHAR_LIBINTL_STATIC_INLINE  
    436 const wchar_t* dwgettext_(const char *domainname, const char* msgid, const wchar_t* wmsgid) 
    437 { 
    438   const char* translated = dgettext(domainname, msgid); 
    439   return translated != msgid ? (const wchar_t*)translated : wmsgid; 
     436const wchar_t *dwgettext_ (const char *domainname, const char *msgid, const wchar_t *wmsgid) 
     437{ 
     438  const char *translated = dgettext (domainname, msgid); 
     439  return translated != msgid ? (const wchar_t *)translated : wmsgid; 
    440440} 
    441441 
    442442WCHAR_LIBINTL_STATIC_INLINE  
    443 const wchar_t* dcwgettext_(const char *domainname, const char* msgid, int category,  const wchar_t* wmsgid) 
    444 { 
    445   const char* translated = dcgettext(domainname, msgid, category); 
    446   return translated != msgid ? (const wchar_t*)translated : wmsgid; 
     443const wchar_t *dcwgettext_ (const char *domainname, const char *msgid, int category,  const wchar_t *wmsgid) 
     444{ 
     445  const char *translated = dcgettext (domainname, msgid, category); 
     446  return translated != msgid ? (const wchar_t *)translated : wmsgid; 
    447447} 
    448448 
    449449WCHAR_LIBINTL_STATIC_INLINE  
    450 const wchar_t* nwgettext_(const char* msgid1, const char* msgid2, unsigned long n, const wchar_t* wmsgid1, const wchar_t* wmsgid2) 
    451 { 
    452   const char* translated = ngettext(msgid1, msgid2, n); 
    453   return translated == msgid1 ? wmsgid1 : (translated == msgid2 ? wmsgid2 : (const wchar_t*)translated); 
     450const wchar_t *nwgettext_ (const char *msgid1, const char *msgid2, unsigned long n, const wchar_t *wmsgid1, const wchar_t *wmsgid2) 
     451{ 
     452  const char *translated = ngettext (msgid1, msgid2, n); 
     453  return translated == msgid1 ? wmsgid1 : (translated == msgid2 ? wmsgid2 : (const wchar_t *)translated); 
    454454} 
    455455 
    456456WCHAR_LIBINTL_STATIC_INLINE  
    457 const wchar_t* dnwgettext_(const char* domainname, const char* msgid1, const char* msgid2, unsigned long n, const wchar_t* wmsgid1, const wchar_t* wmsgid2) 
    458 { 
    459   const char* translated = dngettext(domainname, msgid1, msgid2, n); 
    460   return translated == msgid1 ? wmsgid1 : (translated == msgid2 ? wmsgid2 : (const wchar_t*)translated); 
     457const wchar_t *dnwgettext_ (const char *domainname, const char *msgid1, const char *msgid2, unsigned long n, const wchar_t *wmsgid1, const wchar_t *wmsgid2) 
     458{ 
     459  const char *translated = dngettext (domainname, msgid1, msgid2, n); 
     460  return translated == msgid1 ? wmsgid1 : (translated == msgid2 ? wmsgid2 : (const wchar_t *)translated); 
    461461} 
    462462 
    463463WCHAR_LIBINTL_STATIC_INLINE  
    464 const wchar_t* dcnwgettext_(const char* domainname, const char* msgid1, const char* msgid2, unsigned long n, const wchar_t* wmsgid1, const wchar_t* wmsgid2, int category) 
    465 { 
    466   const char* translated = dcngettext(domainname, msgid1, msgid2, n, category); 
    467   return translated == msgid1 ? wmsgid1 : (translated == msgid2 ? wmsgid2 : (const wchar_t*)translated); 
     464const wchar_t *dcnwgettext_ (const char *domainname, const char *msgid1, const char *msgid2, unsigned long n, const wchar_t *wmsgid1, const wchar_t *wmsgid2, int category) 
     465{ 
     466  const char *translated = dcngettext (domainname, msgid1, msgid2, n, category); 
     467  return translated == msgid1 ? wmsgid1 : (translated == msgid2 ? wmsgid2 : (const wchar_t *)translated); 
    468468} 
    469469 
     
    491491 
    492492WCHAR_LIBINTL_STATIC_INLINE 
    493 const wchar_t *windows_wbindtextdomain (const char* domainname, const wchar_t* dirname16) 
    494 { 
    495   char* dirname8 = NULL; 
     493const wchar_t *windows_wbindtextdomain (const char *domainname, const wchar_t *dirname16) 
     494{ 
     495  char *dirname8 = NULL; 
    496496  unsigned int num_elements = 0; 
    497497 
     
    532532 
    533533WCHAR_LIBINTL_STATIC_INLINE 
    534 const char *windows_bindtextdomain(const char* domainname, const char* dirname) 
    535 { 
    536   wchar_t* dirname16 = NULL; 
     534const char *windows_bindtextdomain(const char *domainname, const char *dirname) 
     535{ 
     536  wchar_t *dirname16 = NULL; 
    537537  unsigned int num_elements = 0; 
    538538  UINT acp = 0; 
     
    551551    } 
    552552 
    553   dirname16 = (wchar_t *)malloc (num_elements*sizeof(wchar_t)); 
     553  dirname16 = (wchar_t *)malloc (num_elements * sizeof(wchar_t)); 
    554554 
    555555  if (0 == MultiByteToWideChar (acp, 0, dirname, -1, 
     
    582582 
    583583#endif /* libintl.h */ 
     584 
     585 
  • lang/c/libintl-msvc/recipes/loadmsgcat-windows.h

    r24529 r24533  
    3535    } 
    3636 
    37   pathname16 = (wchar_t *)malloc (num_elements*sizeof(wchar_t)); 
     37  pathname16 = (wchar_t *)malloc (num_elements * sizeof(wchar_t)); 
    3838  if (0 == MultiByteToWideChar (CP_UTF8, 0, pathname8, -1,  
    3939                                pathname16, num_elements))