CVS fails to compile (ext/mysql)

From latest CVS (ZendEngine 1): gcc -Iext/mysql/ -I/mnt/data1/Apps/CVS/PHP/php4/ext/mysql/ -DPHP_ATOM_INC -I/mnt/data1/Apps/CVS/PHP/php4/include -I/mnt/data1/Apps/CVS/PHP/php4/main -I/mnt/data1/Apps/CVS/PHP/php4 -I/usr/local/include -I/usr/local/www/httpd2/include -I/mnt/data1/Apps/CVS/PHP/php4/Zend -I/usr/include/libxml2 -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/c-client -I/usr/local/www/mysql4/include/mysql -I/usr/include/pspell -I/usr/include/ucd-snmp -D_REENTRANT -I/mnt/data1/Apps/CVS/PHP/php4/TSRM -g -O2 -pthread -Wall -DZTS -c /mnt/data1/Apps/CVS/PHP/php4/ext/mysql/php_mysql.c -fPIC -DPIC -o ext/mysql/php_mysql.lo In file included from /usr/local/www/mysql4/include/mysql/mysql.h:58, from /mnt/data1/Apps/CVS/PHP/php4/ext/mysql/php_mysql.c:65: /usr/local/www/mysql4/include/mysql/mysql_version.h:15: warning: `MYSQL_UNIX_ADDR' redefined /mnt/data1/Apps/CVS/PHP/php4/TSRM/../main/php_config.h:1592: warning: this is the location of the previous definition /mnt/data1/Apps/CVS/PHP/php4/ext/mysql/php_mysql.c: In function `zif_mysql_info': /mnt/data1/Apps/CVS/PHP/php4/ext/mysql/php_mysql.c:940: warning: `id' might be used uninitialized in this function /mnt/data1/Apps/CVS/PHP/php4/ext/mysql/php_mysql.c: In function `zif_mysql_fetch_object': /mnt/data1/Apps/CVS/PHP/php4/ext/mysql/php_mysql.c:1845: `ZEND_STANDARD_CLASS_DEF_PTR' undeclared (first use in this function) /mnt/data1/Apps/CVS/PHP/php4/ext/mysql/php_mysql.c:1845: (Each undeclared identifier is reported only once /mnt/data1/Apps/CVS/PHP/php4/ext/mysql/php_mysql.c:1845: for each function it appears in.) make: *** [ext/mysql/php_mysql.lo] Error 1 / Magnus