Normalize HAVE_MEMCACHED_SESSION checks

php-memcached-dev · Jan 17, 2011 · f584126 · f584126
1 parent 0399e8b
commit f584126
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/php_memcached.c b/php_memcached.c
@@ -272,7 +272,7 @@ static PHP_INI_MH(OnUpdateSerializer)
 
 /* {{{ INI entries */
 PHP_INI_BEGIN()
-#if HAVE_MEMCACHED_SESSION
+#ifdef HAVE_MEMCACHED_SESSION
 	STD_PHP_INI_ENTRY("memcached.sess_locking",		"1",		PHP_INI_ALL, OnUpdateBool,		sess_locking_enabled,	zend_php_memcached_globals,	php_memcached_globals)
 	STD_PHP_INI_ENTRY("memcached.sess_lock_wait",		"150000",	PHP_INI_ALL, OnUpdateLongGEZero,sess_lock_wait,			zend_php_memcached_globals,	php_memcached_globals)
 	STD_PHP_INI_ENTRY("memcached.sess_prefix",		"memc.sess.key.",	PHP_INI_ALL, OnUpdateString, sess_prefix,		zend_php_memcached_globals,	php_memcached_globals)
@@ -2721,7 +2721,7 @@ static int php_memc_list_entry(void)
 
 static void php_memc_init_globals(zend_php_memcached_globals *php_memcached_globals_p TSRMLS_DC)
 {
-#if HAVE_MEMCACHED_SESSION
+#ifdef HAVE_MEMCACHED_SESSION
 	MEMC_G(sess_locking_enabled) = 1;
 	MEMC_G(sess_prefix) = NULL;
 	MEMC_G(sess_lock_wait) = 0;
@@ -3427,7 +3427,7 @@ PHP_MINIT_FUNCTION(memcached)
 	php_memc_init_globals(&php_memcached_globals TSRMLS_CC);
 #endif
 
-#if HAVE_MEMCACHED_SESSION
+#ifdef HAVE_MEMCACHED_SESSION
 	php_session_register_module(ps_memcached_ptr);
 #endif
 
@@ -3459,7 +3459,7 @@ PHP_MINFO_FUNCTION(memcached)
 	php_info_print_table_row(2, "Version", PHP_MEMCACHED_VERSION);
 	php_info_print_table_row(2, "libmemcached version", memcached_lib_version());
 
-#if HAVE_MEMCACHED_SESSION
+#ifdef HAVE_MEMCACHED_SESSION
 	php_info_print_table_row(2, "Session support", "yes");
 #else
 	php_info_print_table_row(2, "Session support ", "no");

diff --git a/php_memcached.h b/php_memcached.h
@@ -52,7 +52,7 @@ enum memcached_serializer {
 #endif //HAVE_MEMCACHED_IGBINARY
 
 ZEND_BEGIN_MODULE_GLOBALS(php_memcached)
-#if HAVE_MEMCACHED_SESSION
+#ifdef HAVE_MEMCACHED_SESSION
 	zend_bool sess_locking_enabled;
 	long  sess_lock_wait;
 	char* sess_prefix;

diff --git a/php_memcached_session.c b/php_memcached_session.c
@@ -19,7 +19,7 @@
 #endif
 
 /* {{{ session support */
-#if HAVE_MEMCACHED_SESSION
+#ifdef HAVE_MEMCACHED_SESSION
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/php_memcached_session.h b/php_memcached_session.h
@@ -18,7 +18,7 @@
 #define PHP_MEMCACHED_SESSION_H
 
 /* session handler struct */
-#if HAVE_MEMCACHED_SESSION
+#ifdef HAVE_MEMCACHED_SESSION
 #include "ext/session/php_session.h"
 
 extern ps_module ps_mod_memcached;