Changeset 2527 for pjproject/branches/1.0

Timestamp:

Mar 23, 2009 11:57:55 AM (15 years ago)

Author:

bennylp

Message:

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

Location:

pjproject/branches/1.0

Files:

• . (modified) (1 prop)
• pjlib/include/pj/config.h (modified) (1 diff)
• pjlib/include/pj/timer.h (modified) (1 diff)

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

@@ -109 +109 @@
 #   include <pj/compat/os_sunos.h>
 
-#elif defined(PJ_DARWINOS) || defined(__MACOSX__)
+#elif defined(PJ_DARWINOS) || defined(__MACOSX__) || \
+      defined (__APPLE__) || defined (__MACH__)
     /*
      * MacOS X

pjproject/branches/1.0/pjlib/include/pj/timer.h

@@ -259 +259 @@
  * @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.