diff options
| author | Benny Prijono <bennylp@teluu.com> | 2009-03-23 11:57:55 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2009-03-23 11:57:55 +0000 |
| commit | d726c567aa80b74317dcc0a26edebf71c8fd634b (patch) | |
| tree | 47587ac8ee6b7475ec1ee3ac63b970f8ac63aa89 | |
| parent | 2cb03b78e0f1adeb9739525853ff422fb908c2cf (diff) | |
Ticket #715: back-porting changes in ticket #703 to 1.0 branch
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/1.0@2527 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjlib/include/pj/config.h | 3 | ||||
| -rw-r--r-- | pjlib/include/pj/timer.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pjlib/include/pj/config.h b/pjlib/include/pj/config.h index 7d9f3215..b51a7585 100644 --- a/pjlib/include/pj/config.h +++ b/pjlib/include/pj/config.h @@ -108,7 +108,8 @@ # define PJ_SUNOS 1 # include <pj/compat/os_sunos.h> -#elif defined(PJ_DARWINOS) || defined(__MACOSX__) +#elif defined(PJ_DARWINOS) || defined(__MACOSX__) || \ + defined (__APPLE__) || defined (__MACH__) /* * MacOS X */ diff --git a/pjlib/include/pj/timer.h b/pjlib/include/pj/timer.h index a8b3eb6e..dbcae718 100644 --- a/pjlib/include/pj/timer.h +++ b/pjlib/include/pj/timer.h @@ -258,8 +258,8 @@ PJ_DECL(pj_status_t) pj_timer_heap_earliest_time( pj_timer_heap_t *ht, * * @param ht The timer heap. * @param next_delay If this parameter is not NULL, it will be filled up with - * the time delay until the next timer elapsed, or -1 in - * the sec part if no entry exist. + * the time delay until the next timer elapsed, or + * PJ_MAXINT32 in the sec part if no entry exist. * * @return The number of timers expired. */ |