apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: apr/include apr_general.h
Date Sun, 19 Aug 2001 05:45:41 GMT
rbb         01/08/18 22:45:41

  Modified:    .        CHANGES
               include  apr_general.h
  Log:
  Rename XtOffset to APR_XtOffset.  This namespace protection
  is important to keep from conflicting with other packages.
  Submitted by:	Doug MacEachern
  
  Revision  Changes    Path
  1.141     +4 -0      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.140
  retrieving revision 1.141
  diff -u -r1.140 -r1.141
  --- CHANGES	2001/08/17 13:35:34	1.140
  +++ CHANGES	2001/08/19 05:45:41	1.141
  @@ -1,5 +1,9 @@
   Changes with APR b1  
   
  +  *) Rename XtOffset to APR_XtOffset.  This namespace protection
  +     is important to keep from conflicting with other packages.
  +     [Doug MacEachern]
  +
     *) Introduce a new --disable-ipv6 option to disable IPv6 support.
        [Sterling Hughes <sterling@designmultimedia.com>, Jeff
        Trawick]
  
  
  
  1.60      +6 -6      apr/include/apr_general.h
  
  Index: apr_general.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_general.h,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- apr_general.h	2001/06/06 17:18:58	1.59
  +++ apr_general.h	2001/08/19 05:45:41	1.60
  @@ -90,29 +90,29 @@
   
   #if defined(CRAY) || (defined(__arm) && !defined(LINUX))
   #ifdef __STDC__
  -#define XtOffset(p_type,field) _Offsetof(p_type,field)
  +#define APR_XtOffset(p_type,field) _Offsetof(p_type,field)
   #else
   #ifdef CRAY2
  -#define XtOffset(p_type,field) \
  +#define APR_XtOffset(p_type,field) \
           (sizeof(int)*((unsigned int)&(((p_type)NULL)->field)))
   
   #else /* !CRAY2 */
   
  -#define XtOffset(p_type,field) ((unsigned int)&(((p_type)NULL)->field))
  +#define APR_XtOffset(p_type,field) ((unsigned int)&(((p_type)NULL)->field))
   
   #endif /* !CRAY2 */
   #endif /* __STDC__ */
   #else /* ! (CRAY || __arm) */
   
  -#define XtOffset(p_type,field) \
  +#define APR_XtOffset(p_type,field) \
           ((long) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
   
   #endif /* !CRAY */
   
   #ifdef offsetof
  -#define XtOffsetOf(s_type,field) offsetof(s_type,field)
  +#define APR_XtOffsetOf(s_type,field) offsetof(s_type,field)
   #else
  -#define XtOffsetOf(s_type,field) XtOffset(s_type*,field)
  +#define APR_XtOffsetOf(s_type,field) APR_XtOffset(s_type*,field)
   #endif
   
   
  
  
  

Mime
View raw message