Merge branch 'pull-request/3268'

* pull-request/3268:
  Sync sysvsem and sysvshm versions in phpinfo

Author: smalyshev

ext/sysvsem/php_sysvsem.h

@@ -30,6 +30,7 @@ extern zend_module_entry sysvsem_module_entry;
 #define PHP_SYSVSEM_VERSION PHP_VERSION
 
 PHP_MINIT_FUNCTION(sysvsem);
+PHP_MINFO_FUNCTION(sysvsem);
 PHP_FUNCTION(sem_get);
 PHP_FUNCTION(sem_acquire);
 PHP_FUNCTION(sem_release);

ext/sysvsem/sysvsem.c

@@ -41,6 +41,7 @@
 #include <errno.h>
 
 #include "php_sysvsem.h"
+#include "ext/standard/info.h"
 
 #if !HAVE_SEMUN
 
@@ -99,7 +100,7 @@ zend_module_entry sysvsem_module_entry = {
 	NULL,
 	NULL,
 	NULL,
-	NULL,
+	PHP_MINFO(sysvsem),
 	PHP_SYSVSEM_VERSION,
 	STANDARD_MODULE_PROPERTIES
 };
@@ -178,6 +179,16 @@ PHP_MINIT_FUNCTION(sysvsem)
 }
 /* }}} */
 
+/* {{{ PHP_MINFO_FUNCTION
+ */
+PHP_MINFO_FUNCTION(sysvsem)
+{
+	php_info_print_table_start();
+	php_info_print_table_row(2, "sysvsem support", "enabled");
+	php_info_print_table_end();
+}
+/* }}} */
+
 #define SETVAL_WANTS_PTR
 
 #if defined(_AIX)

ext/sysvshm/php_sysvshm.h

@@ -71,6 +71,7 @@ typedef struct {
 } sysvshm_shm;
 
 PHP_MINIT_FUNCTION(sysvshm);
+PHP_MINFO_FUNCTION(sysvshm);
 PHP_FUNCTION(shm_attach);
 PHP_FUNCTION(shm_detach);
 PHP_FUNCTION(shm_remove);

ext/sysvshm/sysvshm.c

@@ -35,6 +35,7 @@
 #include <errno.h>
 
 #include "php_sysvshm.h"
+#include "ext/standard/info.h"
 #include "ext/standard/php_var.h"
 #include "zend_smart_str.h"
 #include "php_ini.h"
@@ -100,7 +101,7 @@ zend_module_entry sysvshm_module_entry = {
 	NULL,
 	NULL,
 	NULL,
-	NULL,
+	PHP_MINFO(sysvshm),
 	PHP_SYSVSHM_VERSION,
 	STANDARD_MODULE_PROPERTIES
 };
@@ -147,6 +148,16 @@ PHP_MINIT_FUNCTION(sysvshm)
 }
 /* }}} */
 
+/* {{{ PHP_MINFO_FUNCTION
+ */
+PHP_MINFO_FUNCTION(sysvshm)
+{
+	php_info_print_table_start();
+	php_info_print_table_row(2, "sysvshm support", "enabled");
+	php_info_print_table_end();
+}
+/* }}} */
+
 /* {{{ proto int shm_attach(int key [, int memsize [, int perm]])
    Creates or open a shared memory segment */
 PHP_FUNCTION(shm_attach)