Show
Ignore:
Timestamp:
12/19/09 08:12:53 (11 years ago)
Author:
ppalmers
Message:

Merged revisions 1536,1541,1544-1546,1549,1554-1562,1571,1579-1581,1618,1632,1634-1635,1661,1677-1679,1703-1704,1715,1720-1723,1743-1745,1755 via svnmerge from
svn+ssh://ffadosvn@ffado.org/ffado/branches/libffado-2.0

Also fix remaining format string warnings.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libffado

    • Property svnmerge-blocked changed from
      /branches/libffado-2.0:1563,1565,1750

       to /branches/libffado-2.0:1563,1565,1750
    • Property svnmerge-integrated changed from
      /branches/libffado-2.0:1-1532,1566-1570,1572-1578,1582-1617,1619-1631,1633,1636-1660,1662-1676,1680-1686

       to /branches/libffado-2.0:1-1562,1564,1566-1749,1751-1762

  • trunk/libffado/src/libieee1394/test-cyclecalc.cpp

    r1047 r1763  
    5252                          (unsigned int)CYCLE_TIMER_GET_OFFSET(now_ctr)); 
    5353 
    54     debugOutput(DEBUG_LEVEL_VERBOSE,"NOW              : %011llu (%03us %04uc %04ut)\n", 
     54    debugOutput(DEBUG_LEVEL_VERBOSE,"NOW              : %011"PRIu64" (%03us %04uc %04ut)\n", 
    5555                          now, 
    5656                          (unsigned int)TICKS_TO_SECS(now), 
    …… 
    6868    #endif 
    6969 
    70     debugOutput(DEBUG_LEVEL_VERBOSE,"CALC_TS          : %011llu (%03us %04uc %04ut)\n", 
     70    debugOutput(DEBUG_LEVEL_VERBOSE,"CALC_TS          : %011"PRIu64" (%03us %04uc %04ut)\n", 
    7171                          calc_ts, 
    7272                          (unsigned int)TICKS_TO_SECS(calc_ts),