apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apr/passwd apr_getpass.c apr_md5.c
Date Wed, 20 Dec 2000 16:20:24 GMT
trawick     00/12/20 08:20:21

  Modified:    .        aclocal.m4 hints.m4
               include  apr.h.in apr.hw
               passwd   apr_getpass.c apr_md5.c
  Log:
  Instead of a private AP_CHARSET_EBCDIC which is only defined on
  an EBCDIC machine, define APR_CHARSET_EBCDIC to 0 or 1 for all
  the world to see and use it as appropriate in APR.
  
  I removed the TPF and BS2000 stuff.  If configure doesn't work there
  they need to provide a custom apr.h anyway.
  
  Revision  Changes    Path
  1.38      +4 -1      apr/aclocal.m4
  
  Index: aclocal.m4
  ===================================================================
  RCS file: /home/cvs/apr/aclocal.m4,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- aclocal.m4	2000/12/19 17:05:21	1.37
  +++ aclocal.m4	2000/12/20 16:20:05	1.38
  @@ -321,8 +321,11 @@
     ac_cv_ebcdic="no"
   ])])
     if test "$ac_cv_ebcdic" = "yes"; then
  -    AC_DEFINE(AP_CHARSET_EBCDIC,, [Define if system uses EBCDIC])
  +    apr_charset_ebcdic=1
  +  else
  +    apr_charset_ebcdic=0
     fi
  +  AC_SUBST(apr_charset_ebcdic)
   ])
   
   AC_DEFUN(APR_PREPARE_MM_DIR,[
  
  
  
  1.32      +2 -2      apr/hints.m4
  
  Index: hints.m4
  ===================================================================
  RCS file: /home/cvs/apr/hints.m4,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- hints.m4	2000/12/19 17:05:21	1.31
  +++ hints.m4	2000/12/20 16:20:09	1.32
  @@ -221,11 +221,11 @@
   	;;
       TPF)
          APR_SETIFNULL(CC, [c89])
  -       APR_SETIFNULL(CFLAGS, [-DTPF -DAP_CHARSET_EBCDIC -D_POSIX_SOURCE])
  +       APR_SETIFNULL(CFLAGS, [-DTPF -D_POSIX_SOURCE])
          ;;
       BS2000*-siemens-sysv4*)
   	APR_SETIFNULL(CC, [c89 -XLLML -XLLMK -XL -Kno_integer_overflow])
  -	APR_SETIFNULL(CFLAGS, [-DAP_CHARSET_EBCDIC -DSVR4 -D_XPG_IV])
  +	APR_SETIFNULL(CFLAGS, [-DSVR4 -D_XPG_IV])
   	;;
       *-siemens-sysv4*)
   	APR_SETIFNULL(CFLAGS, [-DSVR4 -D_XPG_IV -DHAS_DLFCN -DUSE_MMAP_FILES -DUSE_SYSVSEM_SERIALIZED_ACCEPT
-DNEED_UNION_SEMUN])
  
  
  
  1.57      +4 -0      apr/include/apr.h.in
  
  Index: apr.h.in
  ===================================================================
  RCS file: /home/cvs/apr/include/apr.h.in,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- apr.h.in	2000/12/12 12:30:26	1.56
  +++ apr.h.in	2000/12/20 16:20:14	1.57
  @@ -116,6 +116,10 @@
    */
   #define APR_INADDR_NONE           @apr_inaddr_none@
   
  +/* This macro indicates whether or not EBCDIC is the native character set.
  + */
  +#define APR_CHARSET_EBCDIC        @apr_charset_ebcdic@
  +
   /* Typedefs that APR needs. */
   
   typedef  @short_value@           apr_int16_t;
  
  
  
  1.42      +4 -0      apr/include/apr.hw
  
  Index: apr.hw
  ===================================================================
  RCS file: /home/cvs/apr/include/apr.hw,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- apr.hw	2000/12/07 06:58:58	1.41
  +++ apr.hw	2000/12/20 16:20:14	1.42
  @@ -185,6 +185,10 @@
    */
   #define APR_INADDR_NONE           INADDR_NONE
   
  +/* This macro indicates whether or not EBCDIC is the native character set.
  + */
  +#define APR_CHARSET_EBCDIC        0
  +
   /* Typedefs that APR needs. */
   
   typedef  short           apr_int16_t;
  
  
  
  1.6       +3 -3      apr/passwd/apr_getpass.c
  
  Index: apr_getpass.c
  ===================================================================
  RCS file: /home/cvs/apr/passwd/apr_getpass.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apr_getpass.c	2000/12/19 17:05:35	1.5
  +++ apr_getpass.c	2000/12/20 16:20:18	1.6
  @@ -78,13 +78,13 @@
   #include <termios.h>
   #endif
   
  -#ifndef AP_CHARSET_EBCDIC
  +#if !APR_CHARSET_EBCDIC
   #define LF 10
   #define CR 13
  -#else /* AP_CHARSET_EBCDIC */
  +#else /* APR_CHARSET_EBCDIC */
   #define LF '\n'
   #define CR '\r'
  -#endif /* AP_CHARSET_EBCDIC */
  +#endif /* APR_CHARSET_EBCDIC */
   
   #define MAX_STRING_LEN 256
   
  
  
  
  1.6       +3 -3      apr/passwd/apr_md5.c
  
  Index: apr_md5.c
  ===================================================================
  RCS file: /home/cvs/apr/passwd/apr_md5.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apr_md5.c	2000/12/19 17:05:36	1.5
  +++ apr_md5.c	2000/12/20 16:20:18	1.6
  @@ -145,7 +145,7 @@
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   };
   
  -#ifdef AP_CHARSET_EBCDIC
  +#if APR_CHARSET_EBCDIC
   static apr_xlate_t *xlate_ebcdic_to_ascii; /* used in apr_MD5Encode() */
   #endif
   
  @@ -460,7 +460,7 @@
   	    (((UINT4) input[j + 2]) << 16) | (((UINT4) input[j + 3]) << 24);
   }
   
  -#ifdef AP_CHARSET_EBCDIC
  +#if APR_CHARSET_EBCDIC
   APR_DECLARE(apr_status_t) apr_MD5InitEBCDIC(apr_xlate_t *xlate)
   {
       xlate_ebcdic_to_ascii = xlate;
  @@ -537,7 +537,7 @@
        * 'Time to make the doughnuts..'
        */
       apr_MD5Init(&ctx);
  -#ifdef AP_CHARSET_EBCDIC
  +#if APR_CHARSET_EBCDIC
       apr_MD5SetXlate(&ctx, xlate_ebcdic_to_ascii);
   #endif
       
  
  
  

Mime
View raw message