apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stri...@apache.org
Subject cvs commit: apr/misc/unix version.c
Date Mon, 22 Apr 2002 08:44:24 GMT
striker     02/04/22 01:44:23

  Modified:    include  apr_general.h apr_pools.h apr_version.h
               misc/unix version.c
  Log:
  Move APR_STRINGIFY to a common place (apr_general.h).  Remove the
  macro from apr_version.h.  Remove the APR_POOL_STRINGIZE macro
  form apr_pools.h and use APR_STRINGIZE instead.
  
  Revision  Changes    Path
  1.71      +3 -0      apr/include/apr_general.h
  
  Index: apr_general.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_general.h,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- apr_general.h	13 Apr 2002 19:27:24 -0000	1.70
  +++ apr_general.h	22 Apr 2002 08:44:22 -0000	1.71
  @@ -173,6 +173,9 @@
    * String and memory functions
    */
   
  +#define APR_STRINGIFY(n) APR_STRINGIFY_HELPER(n)
  +#define APR_STRINGIFY_HELPER(n) #n
  +
   #if (!APR_HAVE_MEMMOVE)
   #define memmove(a,b,c) bcopy(b,a,c)
   #endif
  
  
  
  1.89      +2 -5      apr/include/apr_pools.h
  
  Index: apr_pools.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_pools.h,v
  retrieving revision 1.88
  retrieving revision 1.89
  diff -u -r1.88 -r1.89
  --- apr_pools.h	15 Apr 2002 14:05:07 -0000	1.88
  +++ apr_pools.h	22 Apr 2002 08:44:23 -0000	1.89
  @@ -83,6 +83,7 @@
    */
   #include "apr.h"
   #include "apr_errno.h"
  +#include "apr_general.h" /* for APR_STRINGIFY */
   #define APR_WANT_MEMFUNC
   #include "apr_want.h"
   
  @@ -165,12 +166,8 @@
   #define APR_POOL_DEBUG 0
   #endif
   
  -/** String to number */
  -#define APR_POOL_STRINGIZE(x) APR_POOL__STRINGIZE(x)
  -/** String to number */
  -#define APR_POOL__STRINGIZE(x) #x
   /** the place in the code where the particular function was called */
  -#define APR_POOL__FILE_LINE__ __FILE__ ":" APR_POOL_STRINGIZE(__LINE__)
  +#define APR_POOL__FILE_LINE__ __FILE__ ":" APR_POOL_STRINGIFY(__LINE__)
   
   
   
  
  
  
  1.4       +0 -5      apr/include/apr_version.h
  
  Index: apr_version.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_version.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- apr_version.h	18 Mar 2002 16:46:41 -0000	1.3
  +++ apr_version.h	22 Apr 2002 08:44:23 -0000	1.4
  @@ -151,11 +151,6 @@
   APR_DECLARE(const char *) apr_version_string(void);
   
   
  -/** Internal: helper macro for stringifying the version numbers */
  -#define APR_STRINGIFY(n) APR_STRINGIFY_HELPER(n)
  -/** Internal: helper macro for stringifying the version numbers */
  -#define APR_STRINGIFY_HELPER(n) #n
  -
   /** Internal: string form of the "is dev" flag */
   #ifdef APR_IS_DEV_VERSION
   #define APR_IS_DEV_STRING "-dev"
  
  
  
  1.3       +1 -0      apr/misc/unix/version.c
  
  Index: version.c
  ===================================================================
  RCS file: /home/cvs/apr/misc/unix/version.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- version.c	13 Mar 2002 20:39:23 -0000	1.2
  +++ version.c	22 Apr 2002 08:44:23 -0000	1.3
  @@ -53,6 +53,7 @@
    */
   
   #include "apr_version.h"
  +#include "apr_general.h" /* for APR_STRINGIFY */
   
   APR_DECLARE(void) apr_version(apr_version_t *pvsn)
   {
  
  
  

Mime
View raw message