hyanantha Wed Jul 27 07:22:39 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/standard datetime.c head.c image.c pageinfo.c math.c
filestat.c
Log:
ext/standard/datetime.c
Removed redundant NEW_LIBC checks
ext/standard/head.c
Removed redundant inclusion of headers
ext/standard/image.c
Removed redundant inclusion of headers
ext/standard/pageinfo.c
Removed redundant CLIB_STAT_CHECK. BG(page_mtime) was giving nano seconds
portion out of timespec corrected to seconds.
ext/standard/math.c
Not to hardcode inability as much as possible, in future NetWare LibC SDK
might have asinh that time autoconf can make this function available.
ext/standard/filestat.c
Fixed the typo of accessing the nano seconds from a timer_spec to seconds.
--Kamesh
http://cvs.php.net/diff.php/php-src/ext/standard/datetime.c?r1=1.96.2.19&r2=1.96.2.19.2.1&ty=u
Index: php-src/ext/standard/datetime.c
diff -u php-src/ext/standard/datetime.c:1.96.2.19
php-src/ext/standard/datetime.c:1.96.2.19.2.1
--- php-src/ext/standard/datetime.c:1.96.2.19 Thu Apr 14 09:30:27 2005
+++ php-src/ext/standard/datetime.c Wed Jul 27 07:22:36 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: datetime.c,v 1.96.2.19 2005/04/14 13:30:27 iliaa Exp $ */
+/* $Id: datetime.c,v 1.96.2.19.2.1 2005/07/27 11:22:36 hyanantha Exp $ */
#include "php.h"
#include "zend_operators.h"
@@ -52,7 +52,7 @@
};
#if !defined(HAVE_TM_ZONE) && !defined(_TIMEZONE) &&
!defined(HAVE_DECLARED_TIMEZONE)
-#if defined(NETWARE) && defined(NEW_LIBC)
+#ifdef NETWARE
#define timezone _timezone /* timezone is called '_timezone' in new
version of LibC */
#endif
extern time_t timezone;
http://cvs.php.net/diff.php/php-src/ext/standard/head.c?r1=1.66.2.4&r2=1.66.2.4.2.1&ty=u
Index: php-src/ext/standard/head.c
diff -u php-src/ext/standard/head.c:1.66.2.4
php-src/ext/standard/head.c:1.66.2.4.2.1
--- php-src/ext/standard/head.c:1.66.2.4 Fri Jan 7 16:14:23 2005
+++ php-src/ext/standard/head.c Wed Jul 27 07:22:36 2005
@@ -15,14 +15,9 @@
| Author: Rasmus Lerdorf <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: head.c,v 1.66.2.4 2005/01/07 21:14:23 tony2001 Exp $ */
+/* $Id: head.c,v 1.66.2.4.2.1 2005/07/27 11:22:36 hyanantha Exp $ */
#include <stdio.h>
-
-#if defined(NETWARE) && !defined(NEW_LIBC)
-#include <sys/socket.h>
-#endif
-
#include "php.h"
#include "ext/standard/php_standard.h"
#include "SAPI.h"
http://cvs.php.net/diff.php/php-src/ext/standard/image.c?r1=1.72.2.19&r2=1.72.2.19.2.1&ty=u
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.72.2.19
php-src/ext/standard/image.c:1.72.2.19.2.1
--- php-src/ext/standard/image.c:1.72.2.19 Wed Jun 1 18:29:20 2005
+++ php-src/ext/standard/image.c Wed Jul 27 07:22:36 2005
@@ -17,13 +17,10 @@
+----------------------------------------------------------------------+
*/
-/* $Id: image.c,v 1.72.2.19 2005/06/01 22:29:20 iliaa Exp $ */
+/* $Id: image.c,v 1.72.2.19.2.1 2005/07/27 11:22:36 hyanantha Exp $ */
#include "php.h"
#include <stdio.h>
-#if defined(NETWARE) && !defined(NEW_LIBC)
-#include <sys/socket.h>
-#endif
#if HAVE_FCNTL_H
#include <fcntl.h>
#endif
http://cvs.php.net/diff.php/php-src/ext/standard/pageinfo.c?r1=1.34.2.1.8.1&r2=1.34.2.1.8.2&ty=u
Index: php-src/ext/standard/pageinfo.c
diff -u php-src/ext/standard/pageinfo.c:1.34.2.1.8.1
php-src/ext/standard/pageinfo.c:1.34.2.1.8.2
--- php-src/ext/standard/pageinfo.c:1.34.2.1.8.1 Tue Jul 26 05:32:58 2005
+++ php-src/ext/standard/pageinfo.c Wed Jul 27 07:22:36 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pageinfo.c,v 1.34.2.1.8.1 2005/07/26 09:32:58 hyanantha Exp $ */
+/* $Id: pageinfo.c,v 1.34.2.1.8.2 2005/07/27 11:22:36 hyanantha Exp $ */
#include "php.h"
#include "pageinfo.h"
@@ -59,11 +59,7 @@
*/
PHPAPI void php_statpage(TSRMLS_D)
{
-#if defined(NETWARE) && defined(CLIB_STAT_PATCH)
- struct stat_libc *pstat;
-#else
struct stat *pstat;
-#endif
pstat = sapi_get_stat(TSRMLS_C);
@@ -73,7 +69,7 @@
BG(page_gid) = pstat->st_gid;
BG(page_inode) = pstat->st_ino;
#ifdef NETWARE
- BG(page_mtime) = (pstat->st_mtime).tv_nsec;
+ BG(page_mtime) = (pstat->st_mtime).tv_sec;
#else
BG(page_mtime) = pstat->st_mtime;
#endif
http://cvs.php.net/diff.php/php-src/ext/standard/math.c?r1=1.97.2.13&r2=1.97.2.13.2.1&ty=u
Index: php-src/ext/standard/math.c
diff -u php-src/ext/standard/math.c:1.97.2.13
php-src/ext/standard/math.c:1.97.2.13.2.1
--- php-src/ext/standard/math.c:1.97.2.13 Mon Dec 13 19:40:01 2004
+++ php-src/ext/standard/math.c Wed Jul 27 07:22:36 2005
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: math.c,v 1.97.2.13 2004/12/14 00:40:01 iliaa Exp $ */
+/* $Id: math.c,v 1.97.2.13.2.1 2005/07/27 11:22:36 hyanantha Exp $ */
#include "php.h"
#include "php_math.h"
@@ -329,7 +329,7 @@
/* }}} */
-#if !defined(PHP_WIN32) && !defined(NETWARE)
+#ifndef PHP_WIN32
#ifdef HAVE_ASINH
/* {{{ proto float asinh(float number)
Returns the inverse hyperbolic sine of the number, i.e. the value whose
hyperbolic sine is number */
@@ -380,7 +380,7 @@
}
/* }}} */
#endif /* HAVE_ATANH */
-#endif /* !defined(PHP_WIN32) && !defined(NETWARE) */
+#endif /* ifndf PHP_WIN32 */
/* {{{ proto float pi(void)
http://cvs.php.net/diff.php/php-src/ext/standard/filestat.c?r1=1.112.2.11.2.1&r2=1.112.2.11.2.2&ty=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.112.2.11.2.1
php-src/ext/standard/filestat.c:1.112.2.11.2.2
--- php-src/ext/standard/filestat.c:1.112.2.11.2.1 Tue Jul 26 05:32:58 2005
+++ php-src/ext/standard/filestat.c Wed Jul 27 07:22:36 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filestat.c,v 1.112.2.11.2.1 2005/07/26 09:32:58 hyanantha Exp $ */
+/* $Id: filestat.c,v 1.112.2.11.2.2 2005/07/27 11:22:36 hyanantha Exp $ */
#include "php.h"
#include "safe_mode.h"
@@ -678,19 +678,19 @@
RETURN_LONG((long)BG(sb).st_gid);
case FS_ATIME:
#ifdef NETWARE
- RETURN_LONG((long)(BG(sb).st_atime).tv_nsec);
+ RETURN_LONG((long)(BG(sb).st_atime).tv_sec);
#else
RETURN_LONG((long)BG(sb).st_atime);
#endif
case FS_MTIME:
#ifdef NETWARE
- RETURN_LONG((long)(BG(sb).st_mtime).tv_nsec);
+ RETURN_LONG((long)(BG(sb).st_mtime).tv_sec);
#else
RETURN_LONG((long)BG(sb).st_mtime);
#endif
case FS_CTIME:
#ifdef NETWARE
- RETURN_LONG((long)(BG(sb).st_ctime).tv_nsec);
+ RETURN_LONG((long)(BG(sb).st_ctime).tv_sec);
#else
RETURN_LONG((long)BG(sb).st_ctime);
#endif
@@ -769,9 +769,9 @@
#endif
MAKE_LONG_ZVAL_INCREF(stat_size, stat_sb->st_size);
#ifdef NETWARE
- MAKE_LONG_ZVAL_INCREF(stat_atime, (stat_sb->st_atime).tv_nsec);
- MAKE_LONG_ZVAL_INCREF(stat_mtime, (stat_sb->st_mtime).tv_nsec);
- MAKE_LONG_ZVAL_INCREF(stat_ctime, (stat_sb->st_ctime).tv_nsec);
+ MAKE_LONG_ZVAL_INCREF(stat_atime, (stat_sb->st_atime).tv_sec);
+ MAKE_LONG_ZVAL_INCREF(stat_mtime, (stat_sb->st_mtime).tv_sec);
+ MAKE_LONG_ZVAL_INCREF(stat_ctime, (stat_sb->st_ctime).tv_sec);
#else
MAKE_LONG_ZVAL_INCREF(stat_atime, stat_sb->st_atime);
MAKE_LONG_ZVAL_INCREF(stat_mtime, stat_sb->st_mtime);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
