apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apr/include/arch/unix i18n.h
Date Mon, 24 Jun 2002 02:07:29 GMT
wrowe       2002/06/23 19:07:29

  Modified:    i18n/unix utf8_ucs2.c
               include/arch/unix i18n.h
  Log:
    Already exported on unix, we need this exported to write WinNT accessors
    for objects such as services and the registry that have no apr-izable
    concept for any other platforms.
  
  Revision  Changes    Path
  1.8       +8 -4      apr/i18n/unix/utf8_ucs2.c
  
  Index: utf8_ucs2.c
  ===================================================================
  RCS file: /home/cvs/apr/i18n/unix/utf8_ucs2.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- utf8_ucs2.c	13 Mar 2002 20:39:13 -0000	1.7
  +++ utf8_ucs2.c	24 Jun 2002 02:07:28 -0000	1.8
  @@ -98,8 +98,10 @@
    * apr_conv_ucs2_to_utf8 out words:sizeof(in) / 2 <= Req <= sizeof(in) * 3 / 2
    */
   
  -apr_status_t apr_conv_utf8_to_ucs2(const char *in, apr_size_t *inbytes,
  -                                   apr_wchar_t *out, apr_size_t *outwords)
  +APR_DECLARE(apr_status_t) apr_conv_utf8_to_ucs2(const char *in, 
  +                                                apr_size_t *inbytes,
  +                                                apr_wchar_t *out, 
  +                                                apr_size_t *outwords)
   {
       apr_int64_t newch, mask;
       apr_size_t expect, eating;
  @@ -207,8 +209,10 @@
       return APR_SUCCESS;
   }
   
  -apr_status_t apr_conv_ucs2_to_utf8(const apr_wchar_t *in, apr_size_t *inwords,
  -                                   char *out, apr_size_t *outbytes)
  +APR_DECLARE(apr_status_t) apr_conv_ucs2_to_utf8(const apr_wchar_t *in, 
  +                                                apr_size_t *inwords,
  +                                                char *out, 
  +                                                apr_size_t *outbytes)
   {
       apr_int64_t newch, require;
       apr_size_t need;
  
  
  
  1.6       +8 -4      apr/include/arch/unix/i18n.h
  
  Index: i18n.h
  ===================================================================
  RCS file: /home/cvs/apr/include/arch/unix/i18n.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- i18n.h	13 Mar 2002 20:39:18 -0000	1.5
  +++ i18n.h	24 Jun 2002 02:07:28 -0000	1.6
  @@ -71,8 +71,10 @@
    * when the character code is invalid (in or out of context) and the later
    * when more characters were expected, but insufficient characters remain.
    */
  -apr_status_t apr_conv_utf8_to_ucs2(const char *in, apr_size_t *inbytes,
  -                                   apr_wchar_t *out, apr_size_t *outwords);
  +APR_DECLARE(apr_status_t) apr_conv_utf8_to_ucs2(const char *in, 
  +                                                apr_size_t *inbytes,
  +                                                apr_wchar_t *out, 
  +                                                apr_size_t *outwords);
   
   /**
    * An APR internal function for fast ucs-2 wide Unicode format conversion to 
  @@ -83,7 +85,9 @@
    * when the character code is invalid (in or out of context) and the later
    * when more words were expected, but insufficient words remain.
    */
  -apr_status_t apr_conv_ucs2_to_utf8(const apr_wchar_t *in, apr_size_t *inwords,
  -                                   char *out, apr_size_t *outbytes);
  +APR_DECLARE(apr_status_t) apr_conv_ucs2_to_utf8(const apr_wchar_t *in, 
  +                                                apr_size_t *inwords,
  +                                                char *out, 
  +                                                apr_size_t *outbytes);
   
   #endif /* def I18N_H */
  
  
  

Mime
View raw message