*** empty log message ***

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index 7e9423e84e7f522e683fa2bba8f1bdb551b36f05..628ccf9c17fce7d5c3efe9161e94f4aefad756ae 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -224,23 +224,24 @@ extern "C" {
 
 #if __GNUC__ >= 3
 # define expect(expr,value)         __builtin_expect ((expr),(value))
 
 #if __GNUC__ >= 3
 # define expect(expr,value)         __builtin_expect ((expr),(value))

-# define inline_size                static inline /* inline for codesize */
-# if EV_MINIMAL
-#  define noinline                  __attribute__ ((noinline))
-#  define inline_speed              static noinline
-# else
-#  define noinline
-#  define inline_speed              static inline
-# endif
+# define noinline                   __attribute__ ((noinline))

 #else
 # define expect(expr,value)         (expr)
 #else
 # define expect(expr,value)         (expr)

-# define inline_speed               static
-# define inline_size                static

 # define noinline
 # define noinline

+# if __STDC_VERSION__ < 199901L
+#  define inline
+# endif

 #endif
 
 #define expect_false(expr) expect ((expr) != 0, 0)
 #define expect_true(expr)  expect ((expr) != 0, 1)
 #endif
 
 #define expect_false(expr) expect ((expr) != 0, 0)
 #define expect_true(expr)  expect ((expr) != 0, 1)

+#define inline_size        static inline
+
+#if EV_MINIMAL
+# define inline_speed      static noinline
+#else
+# define inline_speed      static inline
+#endif

 
 #define NUMPRI    (EV_MAXPRI - EV_MINPRI + 1)
 #define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
 
 #define NUMPRI    (EV_MAXPRI - EV_MINPRI + 1)
 #define ABSPRI(w) (((W)w)->priority - EV_MINPRI)


@@ -1415,7 +1416,7 @@ ev_loop (EV_P_ int flags)
           }
 #endif
 
           }
 #endif
 

-      /* queue check watchers (and execute them) */
+      /* queue prepare watchers (and execute them) */

       if (expect_false (preparecnt))
         {
           queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
       if (expect_false (preparecnt))
         {
           queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);