patch for pear/PECL/fribidi

I've fixed compilation errors for the fribidi extension (see attached patch). It's tested on Linux and Windows with fribidi 0.10.4 and 0.11.-0 (current dev). Please commit. To solve compilation problems on Windows you need a fribidi.lib _with_ char sets. Regards, Kai

Index: fribidi.c =================================================================== RCS file: /repository/pear/PECL/fribidi/fribidi.c,v retrieving revision 1.33 diff -u -r1.33 fribidi.c --- fribidi.c 31 Dec 2002 16:06:37 -0000 1.33 +++ fribidi.c 7 Feb 2003 14:45:38 -0000 @@ -32,7 +32,7 @@ #include <fribidi/fribidi.h> /* The fribidi guys dont believe in BC */ -#ifdef FRIBIDI_CHAR_SET_UTF8 +#ifndef FRIBIDI_CHARSET_UTF8 #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)) {