com php-src: Move macro back to .c file: ext/sockets/php_sock ets.h ext/sockets/sockets.c
| From: | Gustavo André dos Santos Lopes | Date: | Sat, 02 Feb 2013 17:32:38 +0000 |
| Subject: | com php-src: Move macro back to .c file: ext/sockets/php_sock ets.h ext/sockets/sockets.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71107@lists.php.net to get a copy of this message | ||
Commit: 0110662ae9e89d21c119b3287118e82fd435f779
Author: Gustavo Lopes <glopes@nebm.ist.utl.pt> Sat, 2 Feb 2013 18:32:38 +0100
Parents: 73de4d8c689ff5c82373a4837dc8a21c9902a8b2
Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0110662ae9e89d21c119b3287118e82fd435f779
Log:
Move macro back to .c file
Because it depends on a static function on that .c file.
Changed paths:
M ext/sockets/php_sockets.h
M ext/sockets/sockets.c
Diff:
diff --git a/ext/sockets/php_sockets.h b/ext/sockets/php_sockets.h
index 3762e02..fabc9c4 100644
--- a/ext/sockets/php_sockets.h
+++ b/ext/sockets/php_sockets.h
@@ -64,14 +64,6 @@ PHP_SOCKETS_API int php_sockets_le_socket(void);
#define php_sockets_le_socket_name "Socket"
-#define PHP_SOCKET_ERROR(socket, msg, errn) \
- do { \
- int _err = (errn); /* save value to avoid repeated calls to WSAGetLastError() on Windows */ \
- (socket)->error = _err; \
- SOCKETS_G(last_error) = _err; \
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s [%d]: %s", msg, _err,
php_strerror(_err TSRMLS_CC)); \
- } while (0)
-
ZEND_BEGIN_MODULE_GLOBALS(sockets)
int last_error;
char *strerror_buf;
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index c6c5477..06bd0ec 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -114,6 +114,14 @@ static PHP_GINIT_FUNCTION(sockets);
static char *php_strerror(int error TSRMLS_DC);
+#define PHP_SOCKET_ERROR(socket, msg, errn) \
+ do { \
+ int _err = (errn); /* save value to avoid repeated calls to WSAGetLastError() on Windows */ \
+ (socket)->error = _err; \
+ SOCKETS_G(last_error) = _err; \
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s [%d]: %s", msg, _err,
php_strerror(_err TSRMLS_CC)); \
+ } while (0)
+
#define PHP_NORMAL_READ 0x0001
#define PHP_BINARY_READ 0x0002