summaryrefslogtreecommitdiff
path: root/ext/fribidi/php_fribidi.h
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2002-09-16 15:31:32 +0000
committerfoobar <sniper@php.net>2002-09-16 15:31:32 +0000
commitaef1c680bc2bbe26d308dd2da710cf649c688532 (patch)
tree042777602f3c788bafa120bddd374ce0cbfa6d23 /ext/fribidi/php_fribidi.h
parent55362251c8a0298884fba5ecf82fd58f665592be (diff)
downloadphp-git-aef1c680bc2bbe26d308dd2da710cf649c688532.tar.gz
- Require Fribidi 0.10.4 -> no more glib needed.
- Cleaned up a bit.
Diffstat (limited to 'ext/fribidi/php_fribidi.h')
-rw-r--r--ext/fribidi/php_fribidi.h30
1 files changed, 1 insertions, 29 deletions
diff --git a/ext/fribidi/php_fribidi.h b/ext/fribidi/php_fribidi.h
index 757a1d6d68..7e602bbf46 100644
--- a/ext/fribidi/php_fribidi.h
+++ b/ext/fribidi/php_fribidi.h
@@ -21,22 +21,11 @@
#if HAVE_FRIBIDI
-#include "fribidi.h"
-#include "../standard/info.h"
-#include <glib.h>
+#include <fribidi/fribidi.h>
extern zend_module_entry fribidi_module_entry;
#define phpext_fribidi_ptr &fribidi_module_entry
-
-typedef struct _php_fribidi_rsrc{
- guint16 *position_L_to_V_list;
- guint16 *position_V_to_L_list;
- guint8 *embedding_level_list;
- guchar *out_string;
-} php_fribidi_rsrc;
-
-
#ifdef PHP_WIN32
#define PHP_FRIBIDI_API __declspec(dllexport)
#else
@@ -50,22 +39,6 @@ PHP_RSHUTDOWN_FUNCTION(fribidi);
PHP_MINFO_FUNCTION(fribidi);
PHP_FUNCTION(fribidi_log2vis);
-/*void php_fribidi_free_rsrc(php_fribidi_rsrc* p_rsrc);*/
-/*
- Declare any global variables you may need between the BEGIN
- and END macros here:
-
-ZEND_BEGIN_MODULE_GLOBALS(fribidi)
- int global_variable;
-ZEND_END_MODULE_GLOBALS(fribidi)
-*/
-
-/* In every function that needs to use variables in php_fribidi_globals,
- do call FRIBIDILS_FETCH(); after declaring other variables used by
- that function, and always refer to them as FRIBIDIG(variable).
- You are encouraged to rename these macros something shorter, see
- examples in any other php module directory.
-*/
#ifdef ZTS
#define FRIBIDIG(v) TSRMG(fribidi_globals_id, php_fribidi_globals *, v)
@@ -81,7 +54,6 @@ ZEND_END_MODULE_GLOBALS(fribidi)
#endif /* PHP_FRIBIDI_H */
-
/*
* Local variables:
* tab-width: 4