- argh... this is getting annoying

diff --git a/ext/standard/math.c b/ext/standard/math.c
index 6e9dfe07c48405eba72f8f2fb0d65f28d2f2d72a..2368da4aa650f686f988fa349b6507c67765924f 100644 (file)
--- 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 0cfd94854442ecc4dee5d7d7ca4e6e44c33ff484..a7a56c568285a99da8a7f6e0a935ac6fcb1208d2 100644 (file)
--- 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 54b6c9d4326e3af039e96de818d5c628bc4b87e9..4f4228e44bf9b9895381fc8d3b47ccf7f32ec36a 100644 (file)
--- 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 {