1. Ruslan Osmanov
  2. pecl-event

Commits

Ruslan Osmanov  committed d64bc28

Fix: non-static zend_always_inline function failed to compile with some (non-zts) php setups
Preparing for 1.1.1-beta

  • Participants
  • Parent commits c6c03ee
  • Branches master

Comments (0)

Files changed (4)

File package.xml

View file
  • Ignore whitespace
     <email>osmanov@php.net</email>
     <active>yes</active>
   </lead>
-  <date>2013-02-04</date>
+  <date>2013-02-05</date>
   <!--{{{ Current version -->
   <version>
     <release>1.1.1</release>
     <api>1.1.0</api>
   </version>
   <stability>
-    <release>devel</release>
-    <api>devel</api>
+    <release>beta</release>
+    <api>beta</api>
   </stability>
   <license uri="http://www.php.net/license">PHP</license>
   <notes><![CDATA[
-  Fix: the installer failed to determine location of src/common.h
+  Fix: non-static zend_always_inline function failed to compile with some (non-zts) php setups
   ]]></notes>
   <!--}}}-->
   <!--{{{ Contents -->
   </extsrcrelease>
   <!--{{{ changelog-->
   <changelog>
+  <!--{{{ 1.1.1-beta-->
+  <release>
+  <version>
+    <release>1.1.1</release>
+    <api>1.1.0</api>
+  </version>
+  <stability>
+    <release>beta</release>
+    <api>beta</api>
+  </stability>
+  <license uri="http://www.php.net/license">PHP</license>
+  <notes><![CDATA[
+  ]]></notes>
+  </release>
+  <!--}}}-->
+
     <!--{{{ 1.1.1-devel -->
     <release>
       <version>

File php_event.h

View file
  • Ignore whitespace
 #ifndef PHP_EVENT_H
 #define PHP_EVENT_H
 
-#define PHP_EVENT_VERSION "1.1.1-devel"
+#define PHP_EVENT_VERSION "1.1.1-beta"
 
 
 extern zend_module_entry event_module_entry;

File src/util.c

View file
  • Ignore whitespace
 #include "src/common.h"
 #include "src/util.h"
 
-/* {{{ php_event_is_pending 
-Don't allow for pending or active event
-See http://www.wangafu.net/~nickm/libevent-book/Ref4_event.html */
-zend_always_inline zend_bool php_event_is_pending(const struct event *e)
-{
-	return event_pending(e, EV_READ | EV_WRITE | EV_SIGNAL | EV_TIMEOUT, NULL);
-}
-/* }}} */
-
 /* {{{ php_event_zval_to_fd
  * Get numeric file descriptor from PHP stream or Socket resource */
 php_socket_t php_event_zval_to_fd(zval **ppfd TSRMLS_DC)
 }
 /* }}} */
 
-
-
 /*
  * Local variables:
  * tab-width: 4

File src/util.h

View file
  • Ignore whitespace
 #ifndef PHP_EVENT_UTIL_H
 #define PHP_EVENT_UTIL_H
 
-zend_always_inline zend_bool php_event_is_pending(const struct event *e);
 php_socket_t php_event_zval_to_fd(zval **ppfd TSRMLS_DC);
 
+#define php_event_is_pending(e) \
+	event_pending((e), EV_READ | EV_WRITE | EV_SIGNAL | EV_TIMEOUT, NULL)
+
 #define PHP_EVENT_REGISTER_CLASS(name, create_func, ce, ce_functions) \
 {                                                                     \
     zend_class_entry tmp_ce;                                          \