Fix [-Wundef] warning in FPM SAPI

Author: Girgias

sapi/fpm/fpm/events/devpoll.c

@@ -19,7 +19,7 @@
 #include "../fpm.h"
 #include "../zlog.h"
 
-#if HAVE_DEVPOLL
+#ifdef HAVE_DEVPOLL
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -53,15 +53,15 @@ static int npollfds = 0;
 
 struct fpm_event_module_s *fpm_event_devpoll_module() /* {{{ */
 {
-#if HAVE_DEVPOLL
+#ifdef HAVE_DEVPOLL
 	return &devpoll_module;
 #else
 	return NULL;
 #endif /* HAVE_DEVPOLL */
 }
 /* }}} */
 
-#if HAVE_DEVPOLL
+#ifdef HAVE_DEVPOLL
 
 /*
  * Init module

sapi/fpm/fpm/events/epoll.c

@@ -19,7 +19,7 @@
 #include "../fpm.h"
 #include "../zlog.h"
 
-#if HAVE_EPOLL
+#ifdef HAVE_EPOLL
 
 #include <sys/epoll.h>
 #include <errno.h>
@@ -48,15 +48,15 @@ static int epollfd = -1;
 
 struct fpm_event_module_s *fpm_event_epoll_module() /* {{{ */
 {
-#if HAVE_EPOLL
+#ifdef HAVE_EPOLL
 	return &epoll_module;
 #else
 	return NULL;
 #endif /* HAVE_EPOLL */
 }
 /* }}} */
 
-#if HAVE_EPOLL
+#ifdef HAVE_EPOLL
 
 /*
  * Init the module

sapi/fpm/fpm/events/kqueue.c

@@ -19,7 +19,7 @@
 #include "../fpm.h"
 #include "../zlog.h"
 
-#if HAVE_KQUEUE
+#ifdef HAVE_KQUEUE
 
 #include <sys/types.h>
 #include <sys/event.h>
@@ -54,15 +54,15 @@ static int kfd = 0;
  */
 struct fpm_event_module_s *fpm_event_kqueue_module() /* {{{ */
 {
-#if HAVE_KQUEUE
+#ifdef HAVE_KQUEUE
 	return &kqueue_module;
 #else
 	return NULL;
 #endif /* HAVE_KQUEUE */
 }
 /* }}} */
 
-#if HAVE_KQUEUE
+#ifdef HAVE_KQUEUE
 
 /*
  * init kqueue and stuff

sapi/fpm/fpm/events/poll.c

@@ -19,7 +19,7 @@
 #include "../fpm.h"
 #include "../zlog.h"
 
-#if HAVE_POLL
+#ifdef HAVE_POLL
 
 #include <poll.h>
 #include <errno.h>
@@ -52,15 +52,15 @@ static int next_free_slot = 0;
  */
 struct fpm_event_module_s *fpm_event_poll_module() /* {{{ */
 {
-#if HAVE_POLL
+#ifdef HAVE_POLL
 	return &poll_module;
 #else
 	return NULL;
 #endif /* HAVE_POLL */
 }
 /* }}} */
 
-#if HAVE_POLL
+#ifdef HAVE_POLL
 
 /*
  * Init the module

sapi/fpm/fpm/events/port.c

@@ -19,7 +19,7 @@
 #include "../fpm.h"
 #include "../zlog.h"
 
-#if HAVE_PORT
+#ifdef HAVE_PORT
 
 #include <port.h>
 #include <poll.h>
@@ -49,15 +49,15 @@ static int pfd = -1;
 
 struct fpm_event_module_s *fpm_event_port_module() /* {{{ */
 {
-#if HAVE_PORT
+#ifdef HAVE_PORT
 	return &port_module;
 #else
 	return NULL;
 #endif /* HAVE_PORT */
 }
 /* }}} */
 
-#if HAVE_PORT
+#ifdef HAVE_PORT
 
 /*
  * Init the module

sapi/fpm/fpm/events/select.c

@@ -19,7 +19,7 @@
 #include "../fpm.h"
 #include "../zlog.h"
 
-#if HAVE_SELECT
+#ifdef HAVE_SELECT
 
 /* According to POSIX.1-2001 */
 #include <sys/select.h>
@@ -55,15 +55,15 @@ static fd_set fds;
  */
 struct fpm_event_module_s *fpm_event_select_module() /* {{{ */
 {
-#if HAVE_SELECT
+#ifdef HAVE_SELECT
 	return &select_module;
 #else
 	return NULL;
 #endif /* HAVE_SELECT */
 }
 /* }}} */
 
-#if HAVE_SELECT
+#ifdef HAVE_SELECT
 
 /*
  * Init the module

sapi/fpm/fpm/fpm_clock.c

@@ -2,7 +2,7 @@
 
 #include "fpm_config.h"
 
-#if defined(HAVE_CLOCK_GETTIME)
+#ifdef HAVE_CLOCK_GETTIME
 #include <time.h> /* for CLOCK_MONOTONIC */
 #endif
 

sapi/fpm/fpm/fpm_main.c

@@ -33,27 +33,27 @@
 #include <stdio.h>
 #include "php.h"
 
-#if HAVE_SYS_TIME_H
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 #endif
 
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 
 #include <signal.h>
 
 #include <locale.h>
 
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
 
-#if HAVE_SYS_WAIT_H
+#ifdef HAVE_SYS_WAIT_H
 # include <sys/wait.h>
 #endif
 
-#if HAVE_FCNTL_H
+#ifdef HAVE_FCNTL_H
 # include <fcntl.h>
 #endif
 
@@ -1807,7 +1807,7 @@ consult the installation file that came with this distribution, or visit \n\
 <a href=\"http://php.net/install.windows\">the manual page</a>.</p>\n");
 			} zend_catch {
 			} zend_end_try();
-#if defined(ZTS) && !defined(PHP_DEBUG)
+#if defined(ZTS) && !PHP_DEBUG
 			/* XXX we're crashing here in msvc6 debug builds at
 			 * php_message_handler_for_zend:839 because
 			 * SG(request_info).path_translated is an invalid pointer.

sapi/fpm/fpm/fpm_sockets.h

@@ -14,7 +14,7 @@
 /*
   On FreeBSD and OpenBSD, backlog negative values are truncated to SOMAXCONN
 */
-#if (__FreeBSD__) || (__OpenBSD__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
 #define FPM_BACKLOG_DEFAULT -1
 #else
 #define FPM_BACKLOG_DEFAULT 511

sapi/fpm/fpm/fpm_stdio.c

@@ -49,7 +49,7 @@ static inline int fpm_use_error_log() {  /* {{{ */
 	 * - SysV init launch php-fpm as a daemon
 	 * - Systemd launch php-fpm in foreground
 	 */
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
 	if (fpm_global_config.daemonize || (!isatty(STDERR_FILENO) && !fpm_globals.force_stderr)) {
 #else
 	if (fpm_global_config.daemonize) {