From: Gustavo Lopes <glopes@nebm.ist.utl.pt>
Date: Sat, 2 Feb 2013 17:32:38 +0000 (+0100)
Subject: Move macro back to .c file
X-Git-Tag: php-5.5.0alpha5~42^2~1^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0110662ae9e89d21c119b3287118e82fd435f779;p=php

Move macro back to .c file

Because it depends on a static function on that .c file.
---

diff --git a/ext/sockets/php_sockets.h b/ext/sockets/php_sockets.h
index 3762e026aa..fabc9c4c3e 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 c6c5477967..06bd0ec6b4 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