sas Tue Jun 17 20:07:45 2003 EDT
Modified files:
/php4/ext/ircg ircg_scanner.re php_ircg_conversion.c
Log:
Work-around apparent issue with appendc
Fix file inclusion order (Solaris)
Index: php4/ext/ircg/ircg_scanner.re
diff -u php4/ext/ircg/ircg_scanner.re:1.26 php4/ext/ircg/ircg_scanner.re:1.27
--- php4/ext/ircg/ircg_scanner.re:1.26 Tue Jun 10 16:03:31 2003
+++ php4/ext/ircg/ircg_scanner.re Tue Jun 17 20:07:45 2003
@@ -16,14 +16,15 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ircg_scanner.re,v 1.26 2003/06/10 20:03:31 imajes Exp $ */
+/* $Id: ircg_scanner.re,v 1.27 2003/06/18 00:07:45 sas Exp $ */
-#include "php_ircg_alloc.h"
-#include "php_ircg_smart_str.h"
#include <stdio.h>
#include <string.h>
+#include "php_ircg_smart_str.h"
+#include "php_ircg_alloc.h"
+
static const char *color_list[] = {
"white",
"black",
@@ -87,11 +88,7 @@
#define STD_ARGS ctx, start, YYCURSOR
#define PASSTHRU() do {
\
- size_t __len = xp - start;
\
- if (__len == 1)
\
- smart_str_appendc_ex(mctx.result, *start, 1); \
- else
\
- smart_str_appendl_ex(mctx.result, start, __len, 1); \
+ smart_str_appendl_ex(mctx.result, start, xp-start, 1); \
} while (0)
static inline void handle_scheme(STD_PARA)
Index: php4/ext/ircg/php_ircg_conversion.c
diff -u php4/ext/ircg/php_ircg_conversion.c:1.2 php4/ext/ircg/php_ircg_conversion.c:1.3
--- php4/ext/ircg/php_ircg_conversion.c:1.2 Sat Apr 19 14:03:47 2003
+++ php4/ext/ircg/php_ircg_conversion.c Tue Jun 17 20:07:45 2003
@@ -1,5 +1,5 @@
-#include "php_ircg_alloc.h"
#include "php_ircg_smart_str.h"
+#include "php_ircg_alloc.h"
/* {{{ Escape functions */
void php_ircg_js_escape(smart_str *input, smart_str *output)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
