summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTal Peer <tal@php.net>2003-02-06 22:23:21 +0000
committerTal Peer <tal@php.net>2003-02-06 22:23:21 +0000
commit724aeb8baccf72a083f42430a750b378de56a205 (patch)
treeba8fd3a752972e92e93ec8b660cc9b1bb69c2961
parent874661a66ed517df9fb8dc375679fcaeb5387bdd (diff)
downloadphp-git-724aeb8baccf72a083f42430a750b378de56a205.tar.gz
Moving fribidi to PECL
-rw-r--r--ext/fribidi/CREDITS2
-rw-r--r--ext/fribidi/EXPERIMENTAL0
-rw-r--r--ext/fribidi/README56
-rw-r--r--ext/fribidi/config.m446
-rwxr-xr-xext/fribidi/fribidi.c320
-rw-r--r--ext/fribidi/fribidi.dsp108
-rw-r--r--ext/fribidi/php_fribidi.h64
7 files changed, 0 insertions, 596 deletions
diff --git a/ext/fribidi/CREDITS b/ext/fribidi/CREDITS
deleted file mode 100644
index e9d264303f..0000000000
--- a/ext/fribidi/CREDITS
+++ /dev/null
@@ -1,2 +0,0 @@
-FriBidi
-Onn Ben-Zvi, Tal Peer
diff --git a/ext/fribidi/EXPERIMENTAL b/ext/fribidi/EXPERIMENTAL
deleted file mode 100644
index e69de29bb2..0000000000
--- a/ext/fribidi/EXPERIMENTAL
+++ /dev/null
diff --git a/ext/fribidi/README b/ext/fribidi/README
deleted file mode 100644
index 173267aee0..0000000000
--- a/ext/fribidi/README
+++ /dev/null
@@ -1,56 +0,0 @@
-Purpose
-=======
-
-This extension is basically a wrapper for the FriBidi implementation
-of the Unicode Bidi algorithm. The need for such an algorithm rises
-from the bidirectional language usage done by applications.
-Arabic/Hebrew embedded within English is such a case.
-
-Usage
-=====
-
- The only function used is fribidi_log2vis (logical [non-reversed] to visual [reversed]).
- Input:
- 1) The Logical string.
- 2) Base direction of application. Possible values:
- a) FRIBIDI_RTL - right to left
- b) FRIBIDI_LTR - left to right
- c) FRIBIDI_AUTO - autodetect the base direction
- 3) The char code being used, which can be one of the following
- constants:
- a) FRIBIDI_CHARSET_UTF8 (Unicode)
- b) FRIBIDI_CHARSET_8859_6 (Arabic)
- c) FRIBIDI_CHARSET_8859_8 (Hebrew)
- d) FRIBIDI_CHARSET_CP1255 (Hebrew/Yiddish)
- e) FRIBIDI_CHARSET_CP1256 (Arabic)
- f) FRIBIDI_CHARSET_ISIRI_3342 (Persian)
- g) FRIBIDI_CHARSET_CAP_RTL - Used for test purposes, will treat CAPS as non-English letetrs
-
-Note: Currently, FriBidi supports the above Character Codes alone.
-
- Output: A Visual string.
-
-
-Compiling
-===========
-1) Static - ./configure --with-fribidi=base-directory-of-FriBidi-installation-path
- (defaults to /usr/local).
-
-2) dl - same, just add shared, to get .... --with-fribidi=shared,base....
-
-Prerequisites
-=============
-1) FriBidi version 0.10.4 or later must be installed. Latest version can be obtained thru
- http://fribidi.sourceforge.net/
-
-Note
-=====
-
-The function fribidi_log2vis computes three more arrays which are currently not passed back as output.
-These arrays are:
- 1) mapping from the logical to the visual string.
- 2) mapping from the visual to the logical string.
- 3) embedding level of characters as figured out by the FriBidi algorithm.
-
-The extension needs further implementation to support this.
-p.s. - If you don't understand this, you probably don't need it.
diff --git a/ext/fribidi/config.m4 b/ext/fribidi/config.m4
deleted file mode 100644
index 5594252fc7..0000000000
--- a/ext/fribidi/config.m4
+++ /dev/null
@@ -1,46 +0,0 @@
-dnl
-dnl $Id$
-dnl
-
-PHP_ARG_WITH(fribidi, for FriBidi support,
-[ --with-fribidi[=DIR] Include FriBidi support (requires FriBidi >= 0.10.4).])
-
-if test "$PHP_FRIBIDI" != "no"; then
-
- if test "$PHP_FRIBIDI" = "yes"; then
- AC_PATH_PROG(FRIBIDI_CONFIG,fribidi-config,,[/usr/local/bin:$PATH])
- else
- FRIBIDI_CONFIG="$PHP_FRIBIDI/bin/fribidi-config"
- fi
-
- dnl check for fribidi version
- AC_MSG_CHECKING([for FriBidi version])
-
- if test ! -x "$FRIBIDI_CONFIG"; then
- AC_MSG_ERROR([fribidi-config not found.])
- fi
-
- fribidi_version_full=`$FRIBIDI_CONFIG --version`
- fribidi_version=`echo ${fribidi_version_full} | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-
- if test "$fribidi_version" -ge 10004; then
- AC_MSG_RESULT([$fribidi_version_full])
- else
- AC_MSG_ERROR([FriBidi version 0.10.4 or later required.])
- fi
-
- dnl Get the paths
- FRIBIDI_LIBS=`$FRIBIDI_CONFIG --libs`
- FRIBIDI_INCS=`$FRIBIDI_CONFIG --cflags`
-
- if test -n "$FRIBIDI_INCS" && test -n "$FRIBIDI_LIBS"; then
- PHP_EVAL_INCLINE($FRIBIDI_INCS)
- PHP_EVAL_LIBLINE($FRIBIDI_LIBS, FRIBIDI_SHARED_LIBADD)
-
- PHP_NEW_EXTENSION(fribidi, fribidi.c, $ext_shared)
- PHP_SUBST(FRIBIDI_SHARED_LIBADD)
- AC_DEFINE(HAVE_FRIBIDI, 1, [ ])
- else
- AC_MSG_ERROR([Could not find the required paths. Please check your FriBidi installation.])
- fi
-fi
diff --git a/ext/fribidi/fribidi.c b/ext/fribidi/fribidi.c
deleted file mode 100755
index 10ed3bf99c..0000000000
--- a/ext/fribidi/fribidi.c
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP Version 4 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997-2003 The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 2.02 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available at through the world-wide-web at |
- | http://www.php.net/license/2_02.txt. |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Authors: Onn Ben-Zvi <onnb@mercury.co.il> |
- | Tal Peer <tal@php.net>
- +----------------------------------------------------------------------+
- */
-
-/* $Id$ */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "php.h"
-#include "php_fribidi.h"
-
-#if HAVE_FRIBIDI
-
-#include "ext/standard/info.h"
-#include <fribidi/fribidi.h>
-
-/* The fribidi guys dont believe in BC */
-#ifdef FRIBIDI_CHAR_SET_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
-#define FRIBIDI_CHARSET_CP1255 FRIBIDI_CHAR_SET_CP1255
-#define FRIBIDI_CHARSET_CP1256 FRIBIDI_CHAR_SET_CP1256
-#define FRIBIDI_CHARSET_ISIRI_3342 FRIBIDI_CHAR_SET_ISIRI_3342
-#define FRIBIDI_CHARSET_CAP_RTL FRIBIDI_CHAR_SET_CAP_RTL
-#endif
-
-function_entry fribidi_functions[] = {
- PHP_FE(fribidi_log2vis, NULL)
- PHP_FE(fribidi_charset_info, NULL)
- PHP_FE(fribidi_get_charsets, NULL)
- {NULL, NULL, NULL}
-};
-
-zend_module_entry fribidi_module_entry = {
- STANDARD_MODULE_HEADER,
- "fribidi",
- fribidi_functions,
- PHP_MINIT(fribidi),
- PHP_MSHUTDOWN(fribidi),
- NULL,
- NULL,
- PHP_MINFO(fribidi),
- "0.1",
- STANDARD_MODULE_PROPERTIES
-};
-
-#ifdef COMPILE_DL_FRIBIDI
-ZEND_GET_MODULE(fribidi)
-#endif
-
-/* {{{ PHP_MINIT_FUNCTION
- */
-PHP_MINIT_FUNCTION(fribidi)
-{
- /* Charsets */
- REGISTER_LONG_CONSTANT("FRIBIDI_CHARSET_UTF8", FRIBIDI_CHARSET_UTF8, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("FRIBIDI_CHARSET_8859_6", FRIBIDI_CHARSET_ISO8859_6, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("FRIBIDI_CHARSET_8859_8", FRIBIDI_CHARSET_ISO8859_8, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("FRIBIDI_CHARSET_CP1255", FRIBIDI_CHARSET_CP1255, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("FRIBIDI_CHARSET_CP1256", FRIBIDI_CHARSET_CP1256, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("FRIBIDI_CHARSET_ISIRI_3342", FRIBIDI_CHARSET_ISIRI_3342, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("FRIBIDI_CHARSET_CAP_RTL", FRIBIDI_CHARSET_CAP_RTL, CONST_CS | CONST_PERSISTENT);
-
- /* Directions */
- REGISTER_LONG_CONSTANT("FRIBIDI_AUTO", FRIBIDI_TYPE_ON, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("FRIBIDI_LTR", FRIBIDI_TYPE_LTR, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("FRIBIDI_RTL", FRIBIDI_TYPE_RTL, CONST_CS | CONST_PERSISTENT);
-
- return SUCCESS;
-}
-/* }}} */
-
-/* {{{ PHP_MSHUTDOWN_FUNCTION
- */
-PHP_MSHUTDOWN_FUNCTION(fribidi)
-{
- return SUCCESS;
-}
-/* }}} */
-
-/* {{{ PHP_MINFO_FUNCTION
- */
-PHP_MINFO_FUNCTION(fribidi)
-{
- php_info_print_table_start();
- php_info_print_table_row(2, "FriBidi support", "enabled");
- php_info_print_table_row(2, "FriBidi version", FRIBIDI_VERSION);
- php_info_print_table_end();
-}
-/* }}} */
-
-/*
-+ -----------------------------------------------------------+
-| Name: fribidi_log2vis |
-| Purpose: convert a logical string to a visual one |
-| Input: 1) The logical string. |
-| 2) Base direction - |
-| Possible values: |
-| a) FRIBIDI_LTR - left to right. |
-| b) FRIBIDI_RTL - right to left. |
-| c) FRIBIDI_AUTO - autodetected by the Unicode |
-| BiDi algorithm. |
-| 3) Character code being used - |
-| Possible values (i.e., charsets supported) |
-| FRIBIDI_CHARSET_UTF8 |
-| FRIBIDI_CHARSET_8859_6 |
-| FRIBIDI_CHARSET_8859_8 |
-| FRIBIDI_CHARSET_CP1255 |
-| FRIBIDI_CHARSET_CP1256 |
-| FRIBIDI_CHARSET_ISIRI_3342 |
-| FRIBIDI_CHARSET_CAP_RTL |
-| |
-| Output: on success: The visual string. |
-| on failure: FALSE |
-+------------------------------------------------------------+
-*/
-
-/* {{{ proto string fribidi_log2vis(string logical_str, long direction, long charset)
- Convert a logical string to a visual one */
-PHP_FUNCTION(fribidi_log2vis)
-{
- zval **logical_str, **direction, **charset;
- FriBidiChar *u_logical_str, *u_visual_str; /* unicode strings .... */
- char *in_string, *out_string;
- int len, alloc_len;
- FriBidiCharType base_dir;
- FriBidiStrIndex *position_L_to_V_list;
- FriBidiStrIndex *position_V_to_L_list;
- FriBidiLevel *embedding_level_list;
-
- /* get parameters from input */
- if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &logical_str, &direction, &charset) == FAILURE) {
- WRONG_PARAM_COUNT;
- }
-
- /* convert argument types */
- convert_to_string_ex(logical_str);
- convert_to_long_ex(charset);
-
- if (Z_TYPE_PP(direction) == IS_LONG) {
- convert_to_long_ex(direction);
- base_dir = Z_LVAL_PP(direction);
- } else if (Z_TYPE_PP(direction) == IS_STRING) {
- convert_to_string_ex(direction);
- if ((Z_STRVAL_PP(direction))[0] == 'R') {
- base_dir = FRIBIDI_TYPE_RTL;
- } else if (Z_STRVAL_PP(direction)[0] == 'L') {
- base_dir = FRIBIDI_TYPE_LTR;
- } else {
- base_dir = FRIBIDI_TYPE_ON;
- }
-
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The use of strings to mark the base direction is deprecated, please use the FRIBIDI_LTR, FRIBIDI_RTL and FRIBIDI_AUTO constants");
- }
-
- /* allocate space and prepare all local variables */
- len = Z_STRLEN_PP(logical_str);
- in_string = estrndup(Z_STRVAL_PP(logical_str), len);
- alloc_len = len+1;
-
- u_logical_str = (FriBidiChar*) emalloc(sizeof(FriBidiChar)*alloc_len);
- u_visual_str = (FriBidiChar*) emalloc(sizeof(FriBidiChar)*alloc_len);
-
- position_L_to_V_list = (FriBidiStrIndex *) emalloc(sizeof(FriBidiStrIndex)*alloc_len);
- position_V_to_L_list = (FriBidiStrIndex *) emalloc(sizeof(FriBidiStrIndex)*alloc_len);
- embedding_level_list = (FriBidiLevel *) emalloc(sizeof(FriBidiLevel)*alloc_len);
-
- if(in_string[len-1] == '\n') {
- in_string[len-1] = '\0';
- }
-
- switch(Z_LVAL_PP(charset)) {
- case FRIBIDI_CHARSET_UTF8:
- case FRIBIDI_CHARSET_ISO8859_6:
- case FRIBIDI_CHARSET_ISO8859_8:
- case FRIBIDI_CHARSET_CP1255:
- case FRIBIDI_CHARSET_CP1256:
- case FRIBIDI_CHARSET_ISIRI_3342:
- case FRIBIDI_CHARSET_CAP_RTL:
- len = fribidi_charset_to_unicode(Z_LVAL_PP(charset), in_string, len, u_logical_str);
- break;
- default:
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown charset");
- efree(u_logical_str);
- efree(u_visual_str);
- efree(position_L_to_V_list);
- efree(position_V_to_L_list);
- efree(embedding_level_list);
- efree(in_string);
- RETURN_FALSE;
- }
-
- /* visualize the logical.... */
-
- out_string = (char *) emalloc(sizeof(char)*alloc_len);
-
- fribidi_log2vis(u_logical_str, len, &base_dir, u_visual_str, position_L_to_V_list, position_V_to_L_list, embedding_level_list);
-
- /* convert back to original char set */
- switch(Z_LVAL_PP(charset)) {
- case FRIBIDI_CHARSET_UTF8:
- case FRIBIDI_CHARSET_ISO8859_6:
- case FRIBIDI_CHARSET_ISO8859_8:
- case FRIBIDI_CHARSET_CP1255:
- case FRIBIDI_CHARSET_CP1256:
- case FRIBIDI_CHARSET_ISIRI_3342:
- case FRIBIDI_CHARSET_CAP_RTL:
- fribidi_unicode_to_charset(Z_LVAL_PP(charset), u_visual_str, len, out_string);
- break;
- default:
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown charset");
- efree(u_logical_str);
- efree(u_visual_str);
- efree(position_L_to_V_list);
- efree(position_V_to_L_list);
- efree(embedding_level_list);
- efree(out_string);
- efree(in_string);
- RETURN_FALSE;
- }
-
- efree(u_logical_str);
- efree(u_visual_str);
- efree(position_L_to_V_list);
- efree(position_V_to_L_list);
- efree(embedding_level_list);
- efree(in_string);
-
- RETVAL_STRING(out_string, 1);
- efree(out_string);
-}
-/* }}} */
-
-/* {{{ proto array fribidi_charset_info(int charset)
- Returns an array containing information about the specified charset */
-PHP_FUNCTION(fribidi_charset_info)
-{
- long charset;
- char *name, *title, *desc;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &charset) == FAILURE) {
- return;
- }
-
- switch (charset) {
- case FRIBIDI_CHARSET_UTF8:
- case FRIBIDI_CHARSET_ISO8859_6:
- case FRIBIDI_CHARSET_ISO8859_8:
- case FRIBIDI_CHARSET_CP1255:
- case FRIBIDI_CHARSET_CP1256:
- case FRIBIDI_CHARSET_ISIRI_3342:
- case FRIBIDI_CHARSET_CAP_RTL:
- array_init(return_value);
-
- name = fribidi_char_set_name(charset);
- title = fribidi_char_set_title(charset);
- desc = fribidi_char_set_desc(charset);
-
- if (name) {
- add_assoc_string_ex(return_value, "name", sizeof("name"), name, 1);
- }
- if (title) {
- add_assoc_string_ex(return_value, "title", sizeof("title"), title, 1);
- }
- if (desc) {
- add_assoc_string_ex(return_value, "desc", sizeof("desc"), desc, 1);
- }
-
- break;
- default:
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown charset.");
- RETURN_FALSE;
- }
-}
-/* }}} */
-
-/* {{{ proto array fribidi_get_charsets()
- Returns an array containing available charsets */
-PHP_FUNCTION(fribidi_get_charsets)
-{
- array_init(return_value);
-
- add_index_string(return_value, FRIBIDI_CHARSET_UTF8, "FRIBIDI_CHARSET_UTF8", 1);
- add_index_string(return_value, FRIBIDI_CHARSET_CAP_RTL, "FRIBIDI_CHARSET_CAP_RTL", 1);
- add_index_string(return_value, FRIBIDI_CHARSET_ISO8859_6, "FRIBIDI_CHARSET_8859_6", 1);
- add_index_string(return_value, FRIBIDI_CHARSET_ISO8859_8, "FRIBIDI_CHARSET_8859_8", 1);
- add_index_string(return_value, FRIBIDI_CHARSET_CP1255, "FRIBIDI_CHARSET_CP1255", 1);
- add_index_string(return_value, FRIBIDI_CHARSET_CP1256, "FRIBIDI_CHARSET_CP1256", 1);
- add_index_string(return_value, FRIBIDI_CHARSET_ISIRI_3342, "FRIBIDI_CHARSET_ISIRI_3342", 1);
-}
-/* }}} */
-
-#endif /* HAVE_FRIBIDI */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/ext/fribidi/fribidi.dsp b/ext/fribidi/fribidi.dsp
deleted file mode 100644
index 74db2ea743..0000000000
--- a/ext/fribidi/fribidi.dsp
+++ /dev/null
@@ -1,108 +0,0 @@
-# Microsoft Developer Studio Project File - Name="fribidi" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=fribidi - Win32 Debug_TS
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "fribidi.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "fribidi.mak" CFG="fribidi - Win32 Debug_TS"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "fribidi - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fribidi - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "fribidi - Win32 Release_TS"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release_TS"
-# PROP BASE Intermediate_Dir "Release_TS"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_TS"
-# PROP Intermediate_Dir "Release_TS"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FRIBIDI_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\..\php_build" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_FRIBIDI" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_FRIBIDI=1 /D "PHP_FRIBIDI_EXPORTS" /FR /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x407 /d "NDEBUG"
-# ADD RSC /l 0x407 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 fribidi.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_fribidi.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\release"
-
-!ELSEIF "$(CFG)" == "fribidi - Win32 Debug_TS"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug_TS"
-# PROP BASE Intermediate_Dir "Debug_TS"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug_TS"
-# PROP Intermediate_Dir "Debug_TS"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FRIBIDI_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\..\php_build" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_FRIBIDI" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_FRIBIDI=1 /D "PHP_FRIBIDI_EXPORTS" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x407 /d "_DEBUG"
-# ADD RSC /l 0x407 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib fribidi.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_fribidi.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\release"
-
-!ENDIF
-
-# Begin Target
-
-# Name "fribidi - Win32 Release_TS"
-# Name "fribidi - Win32 Debug_TS"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\fribidi.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\php_fribidi.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/ext/fribidi/php_fribidi.h b/ext/fribidi/php_fribidi.h
deleted file mode 100644
index 4bbd451847..0000000000
--- a/ext/fribidi/php_fribidi.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP Version 4 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997-2003 The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 2.02 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available at through the world-wide-web at |
- | http://www.php.net/license/2_02.txt. |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Author: Onn Ben-Zvi <onn@zend.com>, onnb@mercury.co.il |
- +----------------------------------------------------------------------+
- */
-
-#ifndef PHP_FRIBIDI_H
-#define PHP_FRIBIDI_H
-
-#if HAVE_FRIBIDI
-
-#include <fribidi/fribidi.h>
-
-extern zend_module_entry fribidi_module_entry;
-#define phpext_fribidi_ptr &fribidi_module_entry
-
-#ifdef PHP_WIN32
-#define PHP_FRIBIDI_API __declspec(dllexport)
-#else
-#define PHP_FRIBIDI_API
-#endif
-
-PHP_MINIT_FUNCTION(fribidi);
-PHP_MSHUTDOWN_FUNCTION(fribidi);
-PHP_RINIT_FUNCTION(fribidi);
-PHP_RSHUTDOWN_FUNCTION(fribidi);
-PHP_MINFO_FUNCTION(fribidi);
-
-PHP_FUNCTION(fribidi_log2vis);
-PHP_FUNCTION(fribidi_charset_info);
-PHP_FUNCTION(fribidi_get_charsets);
-
-#ifdef ZTS
-#define FRIBIDIG(v) TSRMG(fribidi_globals_id, php_fribidi_globals *, v)
-#else
-#define FRIBIDIG(v) (fribidi_globals.v)
-#endif
-
-#else
-
-#define phpext_fribidi_ptr NULL
-
-#endif
-
-#endif /* PHP_FRIBIDI_H */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */