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

Comparing libev/ev.c (file contents):
Revision 1.308 by root, Sun Jul 19 20:39:54 2009 UTC vs.
Revision 1.312 by root, Wed Aug 12 18:48:17 2009 UTC

 # include <stdint.h>
 # ifndef EFD_NONBLOCK
 #  define EFD_NONBLOCK O_NONBLOCK
 # endif
 # ifndef EFD_CLOEXEC
+#  ifdef O_CLOEXEC
-#  define EFD_CLOEXEC O_CLOEXEC
+#   define EFD_CLOEXEC O_CLOEXEC
+#  else
+#   define EFD_CLOEXEC 02000000
+#  endif
 # endif
 # ifdef __cplusplus
 extern "C" {
 # endif
 int eventfd (unsigned int initval, int flags);
   for (;;)
     {
       int c = k << 1;
-      if (c > N + HEAP0 - 1)
+      if (c >= N + HEAP0)
         break;
       c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
            ? 1 : 0;
 /* move an element suitably so it is in a correct place */
 inline_size void
 adjustheap (ANHE *heap, int N, int k)
 {
-  if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
+  if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
     upheap (heap, k);
   else
     downheap (heap, N, k);
 }
         }
     }
   if (w->wd >= 0)
     {
+      struct statfs sfs;
       wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
       /* now local changes will be tracked by inotify, but remote changes won't */
       /* unless the filesystem it known to be local, we therefore still poll */
       /* also do poll on <2.6.25, but with normal frequency */
-      struct statfs sfs;
       if (fs_2625 && !statfs (w->path, &sfs))
         if (sfs.f_type == 0x1373 /* devfs */
             || sfs.f_type == 0xEF53 /* ext2/3 */
             || sfs.f_type == 0x3153464a /* jfs */

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