[PHP4BETA] CVS update: php4/ext/standard
| From: | sas | Date: | Sat, 24 Apr 1999 20:48:12 +0000 |
| Subject: | [PHP4BETA] CVS update: php4/ext/standard | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-487@lists.php.net to get a copy of this message | ||
Date: Saturday April 24, 1999 @ 16:48
Author: sas
Update of /repository/php4/ext/standard
In directory php:/tmp/cvs-serv23516/ext/standard
Modified Files:
datetime.c
Log Message:
bugfix port
Index: php4/ext/standard/datetime.c
diff -u php4/ext/standard/datetime.c:1.4 php4/ext/standard/datetime.c:1.5
--- php4/ext/standard/datetime.c:1.4 Fri Apr 23 20:11:55 1999
+++ php4/ext/standard/datetime.c Sat Apr 24 16:48:12 1999
@@ -30,7 +30,7 @@
*/
-/* $Id: datetime.c,v 1.4 1999/04/24 00:11:55 zeev Exp $ */
+/* $Id: datetime.c,v 1.5 1999/04/24 20:48:12 sas Exp $ */
#include "php.h"
@@ -94,18 +94,16 @@
convert_to_long(arguments[i]);
}
t=time(NULL);
- if (gm) {
- tn = gmtime(&t);
#if HAVE_TZSET
- tzset();
-#if HAVE_TM_ZONE
+ tzset();
+#endif
+ tn = localtime(&t);
+ if (gm) {
+#if HAVE_TM_GMTOFF
gmadjust=(tn->tm_gmtoff)/3600;
#else
gmadjust=timezone/3600;
#endif
-#endif
- } else {
- tn = localtime(&t);
}
memcpy(&ta,tn,sizeof(struct tm));
ta.tm_isdst = -1;
--
PHP 4 Beta