edink Tue Aug 3 20:08:16 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/fribidi fribidi.c
Log:
MFH: make it build on windows
http://cvs.php.net/diff.php/php-src/ext/fribidi/fribidi.c?r1=1.32.2.1&r2=1.32.2.2&ty=u
Index: php-src/ext/fribidi/fribidi.c
diff -u php-src/ext/fribidi/fribidi.c:1.32.2.1 php-src/ext/fribidi/fribidi.c:1.32.2.2
--- php-src/ext/fribidi/fribidi.c:1.32.2.1 Tue Dec 31 11:34:33 2002
+++ php-src/ext/fribidi/fribidi.c Tue Aug 3 20:08:16 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fribidi.c,v 1.32.2.1 2002/12/31 16:34:33 sebastian Exp $ */
+/* $Id: fribidi.c,v 1.32.2.2 2004/08/04 00:08:16 edink Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -32,7 +32,7 @@
#include <fribidi/fribidi.h>
/* The fribidi guys dont believe in BC */
-#ifdef FRIBIDI_CHAR_SET_UTF8
+#ifndef FRIBIDI_MICRO_VERSION_STR
#define FRIBIDI_CHARSET_UTF8 FRIBIDI_CHAR_SET_UTF8
#define FRIBIDI_CHARSET_ISO8859_6 FRIBIDI_CHAR_SET_ISO8859_6
#define FRIBIDI_CHARSET_ISO8859_8 FRIBIDI_CHAR_SET_ISO8859_8
@@ -212,7 +212,11 @@
out_string = (char *) emalloc(sizeof(char)*alloc_len);
+#if FRIBIDI_MAJOR_VERSION == 0 && FRIBIDI_MINOR_VERSION <= 10
fribidi_log2vis(u_logical_str, len, &base_dir, u_visual_str,
position_L_to_V_list, position_V_to_L_list, embedding_level_list);
+#else
+ fribidi_log2vis(NULL, u_logical_str, len, &base_dir, u_visual_str,
position_L_to_V_list, position_V_to_L_list, embedding_level_list);
+#endif
/* convert back to original char set */
switch(Z_LVAL_PP(charset)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
