Changeset 2527


Ignore:
Timestamp:
Mar 23, 2009 11:57:55 AM (12 years ago)
Author:
bennylp
Message:

Ticket #715: back-porting changes in ticket #703 to 1.0 branch

Location:
pjproject/branches/1.0
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/1.0

  • pjproject/branches/1.0/pjlib/include/pj/config.h

    r2394 r2527  
    109109#   include <pj/compat/os_sunos.h> 
    110110 
    111 #elif defined(PJ_DARWINOS) || defined(__MACOSX__) 
     111#elif defined(PJ_DARWINOS) || defined(__MACOSX__) || \ 
     112      defined (__APPLE__) || defined (__MACH__) 
    112113    /* 
    113114     * MacOS X 
  • pjproject/branches/1.0/pjlib/include/pj/timer.h

    r1405 r2527  
    259259 * @param ht         The timer heap. 
    260260 * @param next_delay If this parameter is not NULL, it will be filled up with 
    261  *                   the time delay until the next timer elapsed, or -1 in 
    262  *                   the sec part if no entry exist. 
     261 *                   the time delay until the next timer elapsed, or  
     262 *                   PJ_MAXINT32 in the sec part if no entry exist. 
    263263 * 
    264264 * @return           The number of timers expired. 
Note: See TracChangeset for help on using the changeset viewer.