cvs commit: apr-util/xlate xlate.c

[striker]

striker     2002/07/21 09:03:11

  Modified:    xlate    xlate.c
  Log:
  HAVE_ICONV is never defined, use the value of APU_HAVE_ICONV instead.
  
  Revision  Changes    Path
  1.10      +7 -7      apr-util/xlate/xlate.c
  
  Index: xlate.c
  ===================================================================
  RCS file: /home/cvs/apr-util/xlate/xlate.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- xlate.c   20 Jul 2002 22:33:54 -0000      1.9
  +++ xlate.c   21 Jul 2002 16:03:11 -0000      1.10
  @@ -98,7 +98,7 @@
       char *frompage;
       char *topage;
       char *sbcs_table;
  -#if APU_HAVE_APR_ICONV || defined(HAVE_ICONV)
  +#if APU_HAVE_APR_ICONV || APU_HAVE_ICONV
       iconv_t ich;
   #endif
   };
  @@ -182,7 +182,7 @@
       if (old->ich != (apr_iconv_t)-1) {
           return apr_iconv_close(old->ich);
       }
  -#elif defined(HAVE_ICONV)
  +#elif APU_HAVE_ICONV
       if (old->ich != (iconv_t)-1) {
           if (iconv_close(old->ich)) {
               int rv = errno;
  @@ -194,7 +194,7 @@
       return APR_SUCCESS;
   }
   
  -#ifdef HAVE_ICONV
  +#if APU_HAVE_ICONV
   static void check_sbcs(apr_xlate_t *convset)
   {
       char inbuf[256], outbuf[256];
  @@ -227,7 +227,7 @@
           /* TODO: add the table to the cache */
       }
   }
  -#endif /* HAVE_ICONV */
  +#endif /* APU_HAVE_ICONV */
   
   static void make_identity_table(apr_xlate_t *convset)
   {
  @@ -287,7 +287,7 @@
           check_sbcs(new);
       } else
           new->ich = (apr_iconv_t)-1;
  -#elif defined(HAVE_ICONV)
  +#elif APU_HAVE_ICONV
       if (!found) {
           new->ich = iconv_open(topage, frompage);
           if (new->ich == (iconv_t)-1) {
  @@ -299,7 +299,7 @@
           check_sbcs(new);
       } else
           new->ich = (iconv_t)-1;
  -#endif /* HAVE_ICONV */
  +#endif /* APU_HAVE_ICONV */
   
       if (found) {
           *convset = new;
  @@ -375,7 +375,7 @@
           }
       }
       else
  -#elif defined(HAVE_ICONV)
  +#elif APU_HAVE_ICONV
       if (convset->ich != (iconv_t)-1) {
           const char *inbufptr = inbuf;
           char *outbufptr = outbuf;