[ViewVC] Diff of: cvs/libev/ev.h

Comparing libev/ev.h (file contents):
Revision 1.17 by root, Thu Nov 1 11:11:22 2007 UTC vs.
Revision 1.20 by root, Fri Nov 2 16:54:35 2007 UTC

  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef EV_H
 #define EV_H
+#ifdef __cplusplus
+extern "C" {
+#endif
 typedef double ev_tstamp;
 /* eventmask, revents, events... */
 #define EV_UNDEF          -1 /* guaranteed to be invalid */
   int pid;    /* ro */
   int status; /* rw, holds the exit status, use the macros from sys/wait.h */
 };
-#define EVMETHOD_NONE   0
+#define EVMETHOD_AUTO   0 /* consults environment */
 #define EVMETHOD_SELECT 1
-#define EVMETHOD_EPOLL  2
+#define EVMETHOD_POLL   2
+#define EVMETHOD_EPOLL  4
+#define EVMETHOD_ANY    ~0 /* any method, do not consult env */
 #if EV_PROTOTYPES
 extern int ev_method;
-int ev_init (int flags); /* returns ev_method */
+int ev_init (int methods); /* returns ev_method */
 int ev_version_major (void);
 int ev_version_minor (void);
 /* these three calls are suitable for plugging into pthread_atfork */
-void ev_prefork (void);
+void ev_fork_prepare (void);
-void ev_postfork_parent (void);
+void ev_fork_parent (void);
-void ev_postfork_child (void);
+void ev_fork_child (void);
 extern ev_tstamp ev_now; /* time w.r.t. timers and the eventloop, updated after each poll */
 ev_tstamp ev_time (void);
 #endif
 void ev_child_start    (struct ev_child *w);
 void ev_child_stop     (struct ev_child *w);
 #endif
+#ifdef __cplusplus
+}
 #endif
+#endif

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines