Commits

Ruslan Osmanov committed 85d8a5b Merge

Merge branch 'master' into develop

Comments (0)

Files changed (2)

 PHP_METHOD(EvLoop, now);
 PHP_METHOD(EvLoop, run);
 PHP_METHOD(EvLoop, break);
-PHP_METHOD(EvLoop, feed_signal_event);
+PHP_METHOD(EvLoop, feedSignalEvent);
 PHP_METHOD(EvLoop, io);
 PHP_METHOD(EvLoop, timer);
 #if EV_PERIODIC_ENABLE
 /* }}} */
 
 
-#define PHP_EV_LOOP_METHOD_VOID(name)                  \
+#define PHP_EV_LOOP_METHOD_VOID(name, evname)          \
     PHP_METHOD(EvLoop, name)                           \
     {                                                  \
         PHP_EV_LOOP_FETCH_FROM_THIS;                   \
             return;                                    \
         }                                              \
                                                        \
-        ev_##name(EV_A);                               \
+        ev_ ## evname(EV_A);                           \
     }
 
-#define PHP_EV_LOOP_METHOD_INT_VOID(name)              \
-    PHP_METHOD(EvLoop, name)                           \
-    {                                                  \
-        if (zend_parse_parameters_none() == FAILURE) { \
-            return;                                    \
-        }                                              \
-                                                       \
-        RETURN_LONG((long)ev_##name());                \
-    }
-
-#define PHP_EV_LOOP_METHOD_DOUBLE_VOID(name)           \
-    PHP_METHOD(EvLoop, name)                           \
-    {                                                  \
-        if (zend_parse_parameters_none() == FAILURE) { \
-            return;                                    \
-        }                                              \
-                                                       \
-        RETURN_DOUBLE((double)ev_##name());            \
-    }
-
-PHP_EV_LOOP_METHOD_VOID(loopFork)
-PHP_EV_LOOP_METHOD_VOID(verify)
-PHP_EV_LOOP_METHOD_VOID(invokePending)
-PHP_EV_LOOP_METHOD_VOID(nowUpdate)
-PHP_EV_LOOP_METHOD_VOID(suspend)
-PHP_EV_LOOP_METHOD_VOID(resume)
+PHP_EV_LOOP_METHOD_VOID(loopFork, loop_fork)
+PHP_EV_LOOP_METHOD_VOID(verify, verify)
+PHP_EV_LOOP_METHOD_VOID(invokePending, invoke_pending)
+PHP_EV_LOOP_METHOD_VOID(nowUpdate, now_update)
+PHP_EV_LOOP_METHOD_VOID(suspend, suspend)
+PHP_EV_LOOP_METHOD_VOID(resume, resume)
 
 /* {{{ proto double EvLoop::now(void) */
 PHP_METHOD(EvLoop, now)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.