summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerick Rethans <derick@php.net>2002-09-06 07:47:49 +0000
committerDerick Rethans <derick@php.net>2002-09-06 07:47:49 +0000
commit828c2a9c46283f5e58c5870b131016b1d72fab99 (patch)
tree6d309e9c884945db8512ad976cf95f7e4f8eadfd
parent338332c79943eb18db793d3c30124d782e186684 (diff)
downloadphp-git-828c2a9c46283f5e58c5870b131016b1d72fab99.tar.gz
- argh... this is getting annoying
-rw-r--r--ext/standard/math.c2
-rw-r--r--ext/standard/pageinfo.c2
-rw-r--r--ext/standard/parsedate.y9
3 files changed, 9 insertions, 4 deletions
diff --git a/ext/standard/math.c b/ext/standard/math.c
index 6e9dfe07c4..2368da4aa6 100644
--- a/ext/standard/math.c
+++ b/ext/standard/math.c
@@ -314,7 +314,6 @@ PHP_FUNCTION(tanh)
/* }}} */
-/*#ifndef PHP_WIN32*/
#if !defined(PHP_WIN32) && !defined(NETWARE)
/* {{{ proto float asinh(float number)
Returns the inverse hyperbolic sine of the number, i.e. the value whose hyperbolic sine is number */
@@ -472,7 +471,6 @@ PHP_FUNCTION(exp)
/* }}} */
-/*#ifndef PHP_WIN32*/
#if !defined(PHP_WIN32) && !defined(NETWARE)
/* {{{ proto float expm1(float number)
Returns exp(number) - 1, computed in a way that accurate even when the value of number is close to zero */
diff --git a/ext/standard/pageinfo.c b/ext/standard/pageinfo.c
index 0cfd948544..a7a56c5682 100644
--- a/ext/standard/pageinfo.c
+++ b/ext/standard/pageinfo.c
@@ -78,7 +78,7 @@ PHPAPI void php_statpage(TSRMLS_D)
BG(page_gid) = pstat->st_gid;
BG(page_inode) = pstat->st_ino;
#if defined(NETWARE) && defined(NEW_LIBC)
- BG(page_mtime) = (pstat->st_mtime).tv_nsec;
+ BG(page_mtime) = (pstat->st_mtime).tv_nsec;
#else
BG(page_mtime) = pstat->st_mtime;
#endif
diff --git a/ext/standard/parsedate.y b/ext/standard/parsedate.y
index 54b6c9d432..4f4228e44b 100644
--- a/ext/standard/parsedate.y
+++ b/ext/standard/parsedate.y
@@ -205,20 +205,27 @@ spec : /* NULL */
item : time {
yyHaveTime++;
+ printf ("TIME");
}
| zone {
yyHaveZone++;
+ printf ("ZONE");
}
| date {
yyHaveDate++;
+ printf ("DATE");
}
| day {
yyHaveDay++;
+ printf ("DAY");
}
| rel {
yyHaveRel++;
+ printf ("REL");
+ }
+ | number {
+ printf ("NUMBER");
}
- | number
;
time : tUNUMBER tMERIDIAN {