apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject cvs commit: apr/include apr_atomic.h
Date Sat, 03 May 2003 04:11:08 GMT
ianh        2003/05/02 21:11:07

  Modified:    .        CHANGES configure.in
               include  apr_atomic.h
  Removed:     atomic/solaris_sparc apr_atomic_sparc.s
  Log:
  removed the solaris specific atomic code.
  it was under the MPL 1.0 licence, which is incompatible
  with outs.
  tried contacting the author, with no response ;(
  
  Revision  Changes    Path
  1.406     +4 -0      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.405
  retrieving revision 1.406
  diff -u -r1.405 -r1.406
  --- CHANGES	1 May 2003 03:16:29 -0000	1.405
  +++ CHANGES	3 May 2003 04:11:07 -0000	1.406
  @@ -1,5 +1,9 @@
   Changes with APR 0.9.4
   
  +  *) Removed the solaris-specific atomic code, due to licence
  +     concerns (it was MPL 1.0, and the author could not be contacted)
  +     [Ian Holsman]
  +
     *) apr_file_gets(): Return APR_SUCCESS if any characters are
        returned.  Any I/O errors or EOF will be reported on the
        next call.  Callers that are coded to expect returned 
  
  
  
  1.527     +0 -40     apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.526
  retrieving revision 1.527
  diff -u -r1.526 -r1.527
  --- configure.in	29 Apr 2003 19:25:08 -0000	1.526
  +++ configure.in	3 May 2003 04:11:07 -0000	1.527
  @@ -393,46 +393,6 @@
          enable_threads="no"
          eolstr="\\n"
          ;;
  -   *sun*)
  -       case $host_cpu in
  -         *sparc*)
  -            OSDIR="solaris_sparc"
  -            eolstr="\\n"
  -            if test "$nonportable_atomics_enabled" = 1; then
  -              apr_atomic_sparc_compile=apr_atomic_sparc.lo
  -              sparc_arch=`uname -m`
  -              is_gnu_as=`${AS} --help 2>/dev/null | grep gnu.org`
  -              case "$sparc_arch" in
  -                sun4c|sun4m|sun4d|sun4t|sun4)
  -                  apr_force_atomic_generic=1
  -                  apr_atomic_sparc_compile=""
  -                  ;;
  -                *)
  -                  if test -n "$is_gnu_as"; then
  -                    ASFLAGS="-xarch=v8plus -K PIC"
  -                    ASCPPFLAGS="-traditional-cpp -D_ASM -D__STDC__=0"
  -                    ASCPP="gcc -E"
  -                  else 
  -                    ASFLAGS="-K pic -P -D_ASM -D__STDC__=0 -xarch=v8plus"
  -                    ASCPPFLAGS=""
  -                    ASCPP="cat"
  -                  fi
  -                  ;;
  -                esac
  -            else
  -              apr_force_atomic_generic=1
  -              apr_atomic_sparc_compile=""
  -            fi
  -            AC_SUBST(ASCPPFLAGS)
  -            AC_SUBST(ASFLAGS)
  -            AC_SUBST(apr_atomic_sparc_compile)
  -            ;;
  -         *)
  -            OSDIR="unix"
  -            eolstr="\\n"
  -            ;;
  -       esac
  -       ;;
      *linux*)
          apr_force_atomic_generic=1
          case $host_cpu in
  
  
  
  1.48      +0 -16     apr/include/apr_atomic.h
  
  Index: apr_atomic.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_atomic.h,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- apr_atomic.h	5 Mar 2003 21:22:25 -0000	1.47
  +++ apr_atomic.h	3 May 2003 04:11:07 -0000	1.48
  @@ -247,22 +247,6 @@
   #define apr_atomic_read(mem)        (*(mem))
   #define apr_atomic_init(pool)        APR_SUCCESS
   
  -#elif (defined(__sparc__) || defined(sparc)) && !APR_FORCE_ATOMIC_GENERIC
  -
  -#define apr_atomic_t apr_uint32_t
  -#define apr_atomic_read(p)  *p
  -
  -#define apr_atomic_add(mem, val)     apr_atomic_add_sparc(mem,val)
  -#define apr_atomic_dec(mem)          apr_atomic_sub_sparc(mem,1)
  -#define apr_atomic_inc(mem)          apr_atomic_add_sparc(mem,1)
  -#define apr_atomic_cas(mem,val,cond) apr_atomic_cas_sparc(mem,val,cond)
  -#define apr_atomic_set(mem, val)     (*mem = val)
  -#define apr_atomic_init(pool)        APR_SUCCESS
  -
  -apr_uint32_t apr_atomic_add_sparc(volatile apr_atomic_t *mem, apr_uint32_t add);
  -apr_uint32_t apr_atomic_sub_sparc(volatile apr_atomic_t *mem, apr_uint32_t sub);
  -apr_uint32_t apr_atomic_cas_sparc(volatile apr_uint32_t *mem, long with, long cmp);
  -
   #elif defined(__MVS__) /* OS/390 */
   
   #define apr_atomic_t cs_t
  
  
  

Mime
View raw message