Only way I could get it to build was to use the physical string:
U_STRING_DECL(uIncompleteClass, "__PHP_Incomplete_Class",
sizeof(INCOMPLETE_CLASS) - 1);
Rob
Sara Golemon wrote:
pollita Sat Oct 7 04:45:42 2006 UTC
Modified files:
/php-src/ext/standard type.c
Log:
Win32 build gets confused by expansion of U_STRING_DECL macro with constants
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/type.c?r1=1.45&r2=1.46&diff_format=u
Index: php-src/ext/standard/type.c
diff -u php-src/ext/standard/type.c:1.45 php-src/ext/standard/type.c:1.46
--- php-src/ext/standard/type.c:1.45 Fri Oct 6 20:11:25 2006
+++ php-src/ext/standard/type.c Sat Oct 7 04:45:42 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: type.c,v 1.45 2006/10/06 20:11:25 andrei Exp $ */
+/* $Id: type.c,v 1.46 2006/10/07 04:45:42 pollita Exp $ */
#include "php.h"
#include "php_incomplete_class.h"
@@ -238,8 +238,8 @@
/* We can get away with this because
INCOMPLETE_CLASS is ascii and has a 1:1 relationship with unicode */
RETURN_TRUE;
} else if (UG(unicode)) {
- U_STRING_DECL(uIncompleteClass,
INCOMPLETE_CLASS, sizeof(INCOMPLETE_CLASS) - 1);
- U_STRING_INIT(uIncompleteClass,
INCOMPLETE_CLASS, sizeof(INCOMPLETE_CLASS) - 1);
+ U_STRING_DECL(uIncompleteClass,
(INCOMPLETE_CLASS), sizeof(INCOMPLETE_CLASS) - 1);
+ U_STRING_INIT(uIncompleteClass,
(INCOMPLETE_CLASS), sizeof(INCOMPLETE_CLASS) - 1);
if (!memcmp(ce->name.u, uIncompleteClass, UBYTES(sizeof(INCOMPLETE_CLASS)))) {
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
