source: branches/fc11-dev/server/common/patches/openafs-delta-dprintf-rename-20090427.patch @ 1139

Last change on this file since 1139 was 1139, checked in by mitchb, 13 years ago
Apply OpenAFS delta dprintf-rename-20090427 Renames the dpatch #define, which conflicts in Fedora 11
File size: 2.8 KB
  • openafs/src/bucoord/bc.p.h

    RCS file: /cvs/openafs/src/bucoord/bc.p.h,v
    retrieving revision 1.8
    retrieving revision 1.9
    diff -u -r1.8 -r1.9
     
    144144#define BC_MAXSIMDUMPS      64
    145145#define BC_MAXPORTS         128 /* max number of port offsets for volrestore */
    146146/* debugging support */
    147 #define dprintf(x)
     147#define afs_dprintf(x)
  • openafs/src/bucoord/ubik_db_if.c

    RCS file: /cvs/openafs/src/bucoord/ubik_db_if.c,v
    retrieving revision 1.17
    retrieving revision 1.18
    diff -u -r1.17 -r1.18
     
    574574
    575575    fileSize = (afs_int32) filesize(ctPtr->textStream);
    576576
    577     dprintf(("filesize is %d\n", fileSize));
     577    afs_dprintf(("filesize is %d\n", fileSize));
    578578
    579579    rewind(ctPtr->textStream);
    580580
     
    13501350        ERROR(errno);
    13511351#endif
    13521352
    1353     dprintf(("file is %s\n", tmpFileName));
     1353    afs_dprintf(("file is %s\n", tmpFileName));
    13541354
    13551355  normal_exit:
    13561356    return code;
  • openafs/src/config/debug.h

    RCS file: /cvs/openafs/src/config/debug.h,v
    retrieving revision 1.4
    retrieving revision 1.5
    diff -u -r1.4 -r1.5
     
    112112
    113113#if defined(AFS_DEBUG)
    114114#if defined(lint)
    115 #define dprintf(flag, str) printf str
     115#define afs_dprintf(flag, str) printf str
    116116#define dlprintf(flag, level, str) printf str
    117117#define dmprintf(flag, bit, str) printf str
    118118#else /* lint */
    119 #define dprintf(flag, str) \
     119#define afs_dprintf(flag, str) \
    120120      (void)((flag) ? \
    121121             ( osi_dp str, osi_dp("\t%s, %d\n", __FILE__, __LINE__)):0)
    122 #define dlprintf(flag, level, str) dprintf(((flag) >= (level)), str)
    123 #define dmprintf(flag, bit, str) dprintf(((flag)&(1<<((bit)-1))), str)
     122#define dlprintf(flag, level, str) afs_dprintf(((flag) >= (level)), str)
     123#define dmprintf(flag, bit, str) afs_dprintf(((flag)&(1<<((bit)-1))), str)
    124124
    125125#endif /* lint */
    126126
    127127#else /* AFS_DEBUG */
    128128
    129 #define dprintf(flag, str)
     129#define afs_dprintf(flag, str)
    130130#define dlprintf(flag, level,str)
    131131#define dmprintf(flag, bit, str)
    132132
  • openafs/src/sgistuff/rcmd.c

    RCS file: /cvs/openafs/src/sgistuff/rcmd.c,v
    retrieving revision 1.1
    retrieving revision 1.2
    diff -u -r1.1 -r1.2
     
    5555#endif /* defined(AFS_HPUX_ENV) */
    5656#ifdef  TCP_DEBUG
    5757#include <sys/syslog.h>
    58 #       define  DPRINTF(args)   dprintf args
    59 dprintf(args)
     58#       define  DPRINTF(args)   afs_dprintf args
     59afs_dprintf(args)
    6060     char *args;
    6161{
    6262    char **argv;
Note: See TracBrowser for help on using the repository browser.