cellog Sun Mar 5 20:58:31 2006 UTC
Modified files:
/pear-core/OS Guess.php
Log:
remove err suppression @
http://cvs.php.net/viewcvs.cgi/pear-core/OS/Guess.php?r1=1.20&r2=1.21&diff_format=u
Index: pear-core/OS/Guess.php
diff -u pear-core/OS/Guess.php:1.20 pear-core/OS/Guess.php:1.21
--- pear-core/OS/Guess.php:1.20 Wed Oct 26 19:33:03 2005
+++ pear-core/OS/Guess.php Sun Mar 5 20:58:31 2006
@@ -16,7 +16,7 @@
* @author Gregory Beaver <cellog@xxxxxxx>
* @copyright 1997-2005 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version CVS: $Id: Guess.php,v 1.20 2005/10/26 19:33:03 cellog Exp $
+ * @version CVS: $Id: Guess.php,v 1.21 2006/03/05 20:58:31 cellog Exp $
* @link http://pear.php.net/package/PEAR
* @since File available since PEAR 0.1
*/
@@ -205,7 +205,9 @@
if (!file_exists('/usr/bin/cpp') || !is_executable('/usr/bin/cpp')) {
// Use glibc's <features.h> header file to
// get major and minor version number:
- if ($features_file = @fopen('/usr/include/features.h', 'rb') ) {
+ if (file_exists('/usr/include/features.h') &&
+ is_readable('/usr/include/features.h')) {
+ $features_file = fopen('/usr/include/features.h', 'rb');
while (!feof($features_file)) {
$line = fgets($features_file, 8192);
if (!$line || (strpos($line, '#define') === false)) {
|
