RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  [EMAIL PROTECTED]
  Module: rpm                              Date:   19-Jul-2007 08:44:54
  Branch: HEAD                             Handle: 2007071907445400

  Modified files:
    rpm/rpmio               rpmio.h

  Log:
    Allow us to more reasonably debug _free() calls under --with-dmalloc,
    too.

  Summary:
    Revision    Changes     Path
    1.55        +4  -0      rpm/rpmio/rpmio.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmio.h
  ============================================================================
  $ cvs diff -u -r1.54 -r1.55 rpmio.h
  --- rpm/rpmio/rpmio.h 10 Jul 2007 19:46:20 -0000      1.54
  +++ rpm/rpmio/rpmio.h 19 Jul 2007 06:44:54 -0000      1.55
  @@ -842,6 +842,9 @@
    * @param p          memory to free
    * @return           NULL always
    */
  +#if defined(WITH_DMALLOC)
  +#define _free(p) ((p) != NULL ? free((void *)(p)) : (void)0, NULL)
  +#else
   /[EMAIL PROTECTED]@*/ static inline /[EMAIL PROTECTED]@*/
   void * _free(/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL 
PROTECTED]@*/ const void * p)
        /[EMAIL PROTECTED] p @*/
  @@ -850,6 +853,7 @@
       return NULL;
   }
   #endif
  +#endif
   
   #ifdef __cplusplus
   }
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to