Use @twose's suggestion to circumvent GCC bug 69602

Author: Girgias

ext/sockets/sockets.c

@@ -1045,20 +1045,7 @@ PHP_FUNCTION(socket_read)
 	if (retval == -1) {
 		/* if the socket is in non-blocking mode and there's no data to read,
 		don't output any error, as this is a normal situation, and not an error */
-
-/* See GCC bug 69602: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69602 */
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wlogical-op"
-#endif
-		if (errno == EAGAIN
-#ifdef EWOULDBLOCK
-		|| errno == EWOULDBLOCK
-#endif
-		) {
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
+		if (IS_TRANSIENT_ERROR(errno)) {
 			php_sock->error = errno;
 			SOCKETS_G(last_error) = errno;
 		} else {

main/php_network.h

@@ -49,6 +49,13 @@
 # define EWOULDBLOCK EAGAIN
 #endif
 
+/* This is a work around for GCC bug 69602: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69602 */
+#if EAGAIN != EWOULDBLOCK
+# define IS_TRANSIENT_ERROR(err) (err == EAGAIN || err == EWOULDBLOCK)
+#else
+# define IS_TRANSIENT_ERROR(err) (err == EAGAIN)
+#endif
+
 #ifdef PHP_WIN32
 #define php_socket_errno() WSAGetLastError()
 #else

main/streams/plain_wrapper.c

@@ -351,15 +351,7 @@ static ssize_t php_stdiop_write(php_stream *stream, const char *buf, size_t coun
 		ssize_t bytes_written = write(data->fd, buf, count);
 #endif
 		if (bytes_written < 0) {
-
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wlogical-op"
-#endif
-			if (errno == EWOULDBLOCK || errno == EAGAIN) {
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
+			if (IS_TRANSIENT_ERROR(errno)) {
 				return 0;
 			}
 			if (errno == EINTR) {
@@ -428,15 +420,7 @@ static ssize_t php_stdiop_read(php_stream *stream, char *buf, size_t count)
 		}
 
 		if (ret < 0) {
-/* See GCC bug 69602: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69602 */
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wlogical-op"
-#endif
-			if (errno == EWOULDBLOCK || errno == EAGAIN) {
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
+			if (IS_TRANSIENT_ERROR(errno)) {
 				/* Not an error. */
 				ret = 0;
 			} else if (errno == EINTR) {

main/streams/xp_socket.c

@@ -76,15 +76,7 @@ static ssize_t php_sockop_write(php_stream *stream, const char *buf, size_t coun
 		char *estr;
 		int err = php_socket_errno();
 
-/* See GCC bug 69602: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69602 */
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wlogical-op"
-#endif
-		if (err == EWOULDBLOCK || err == EAGAIN) {
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
+		if (IS_TRANSIENT_ERROR(err)) {
 			if (sock->is_blocked) {
 				int retval;
 
@@ -175,15 +167,7 @@ static ssize_t php_sockop_read(php_stream *stream, char *buf, size_t count)
 	err = php_socket_errno();
 
 	if (nr_bytes < 0) {
-/* See GCC bug 69602: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69602 */
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wlogical-op"
-#endif
-		if (err == EAGAIN || err == EWOULDBLOCK) {
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
+		if (IS_TRANSIENT_ERROR(err)) {
 			nr_bytes = 0;
 		} else {
 			stream->eof = 1;

sapi/fpm/fpm/fpm_stdio.c

@@ -166,15 +166,7 @@ static void fpm_stdio_child_said(struct fpm_event_s *ev, short which, void *arg)
 stdio_read:
 		in_buf = read(fd, buf, max_buf_size - 1);
 		if (in_buf <= 0) { /* no data */
-/* See GCC bug 69602: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69602 */
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wlogical-op"
-#endif
-			if (in_buf == 0 || (errno != EAGAIN && errno != EWOULDBLOCK)) {
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
+			if (in_buf == 0 || !IS_TRANSIENT_ERROR(errno)) {
 				/* pipe is closed or error */
 				read_fail = (in_buf < 0) ? in_buf : 1;
 			}