From: Derick Rethans <derick@php.net>
Date: Sat, 28 Aug 2004 12:20:41 +0000 (+0000)
Subject: - MFH: Fixed bug #29873 (No defines around pcntl_*priority definitions).
X-Git-Tag: php-5.0.2RC1~70
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6df40e83136440b45478e64e7a34343242c4ab3;p=php

- MFH: Fixed bug #29873 (No defines around pcntl_*priority definitions).
---

diff --git a/NEWS b/NEWS
index c7693c7aa6..04725bdfc6 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ PHP                                                                        NEWS
   (Paul Hudson, Derick)
 - Fixed bug with raw_post_data not getting set (Brian)
 - Fixed a file-descriptor leak with phpinfo() and other 'special' URLs (Zeev)
+- Fixed bug #29873 (No defines around pcntl_*priority definitions). (Derick)
 - Fixed bug #29844 (SOAP doesn't return the result of a valid SOAP request).
   (Dmitry)
 - Fixed bug #29842 (soapclient return null value). (Dmitry)
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index 8aa9290011..eb1a0f38f1 100755
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@ -56,8 +56,12 @@ function_entry pcntl_functions[] = {
 	PHP_FE(pcntl_wstopsig,		NULL)
 	PHP_FE(pcntl_exec,			NULL)
 	PHP_FE(pcntl_alarm,			NULL)
+#ifdef HAVE_GETPRIORITY
 	PHP_FE(pcntl_getpriority,	NULL)
+#endif
+#ifdef HAVE_SETPRIORITY
 	PHP_FE(pcntl_setpriority,	NULL)
+#endif
 	{NULL, NULL, NULL}	
 };
 
diff --git a/ext/pcntl/php_pcntl.h b/ext/pcntl/php_pcntl.h
index b9ac364f85..590d5779bd 100644
--- a/ext/pcntl/php_pcntl.h
+++ b/ext/pcntl/php_pcntl.h
@@ -51,8 +51,12 @@ PHP_FUNCTION(pcntl_wtermsig);
 PHP_FUNCTION(pcntl_wstopsig);
 PHP_FUNCTION(pcntl_signal);
 PHP_FUNCTION(pcntl_exec);
+#ifdef HAVE_GETPRIORITY
 PHP_FUNCTION(pcntl_getpriority);
+#endif
+#ifdef HAVE_SETPRIORITY
 PHP_FUNCTION(pcntl_setpriority);
+#endif
 
 ZEND_BEGIN_MODULE_GLOBALS(pcntl)
 	HashTable php_signal_table;