Some tiny changes to correspond to fribidi-0.15

Wed Nov 29 11:08:52 2000  Owen Taylor  <otaylor@redhat.com>

	* pango/mini-fribidi/fribidi.c pango/mini-fribidi/fribidi-tables.i:
	Some tiny changes to correspond to fribidi-0.15

	* pango.pc.in pango-config.in pango/Makefile.am:
	Move headers into separate subdir, to avoid
	clashes with future versions of Pango.

3 files changed, 5 insertions, 24 deletions

diff --git a/pango/Makefile.am b/pango/Makefile.am
index 89f0d068..a4e37ea8 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -55,7 +55,7 @@ endif
 libpangox_la_LDFLAGS = -release $(VERSION)
 libpangox_la_LIBADD = $(INCLUDED_MODULES)
 
-pangoincludedir=$(includedir)/pango
+pangoincludedir=$(includedir)/pango-1.0/pango
 
 pangoinclude_HEADERS = 	   \
 	pango.h		   \
diff --git a/pango/mini-fribidi/fribidi.c b/pango/mini-fribidi/fribidi.c
index e4d7efce..62db6124 100644
--- a/pango/mini-fribidi/fribidi.c
+++ b/pango/mini-fribidi/fribidi.c
@@ -41,7 +41,7 @@ typedef struct {
 
 static TypeLink *free_type_links = NULL;
 
-static TypeLink *new_type_link()
+static TypeLink *new_type_link(void)
 {
   TypeLink *link;
   
diff --git a/pango/mini-fribidi/fribidi_tables.i b/pango/mini-fribidi/fribidi_tables.i
index 754ce66a..b5505880 100644
--- a/pango/mini-fribidi/fribidi_tables.i
+++ b/pango/mini-fribidi/fribidi_tables.i
@@ -1,5 +1,5 @@
 /*======================================================================
-//  This file was automatically created from PropList-3.0.txt
+//  This file was automatically created from PropList-3.0.1.txt
 //  by the perl script CreateGetType.pl.
 //----------------------------------------------------------------------*/
 
@@ -558,25 +558,6 @@ guchar FriBidiPropertyBlocka400[256] = {
   ON ,ON ,ON ,ON ,ON ,ON ,ON ,ON ,ON ,ON ,ON ,ON ,ON ,ON ,ON ,ON ,
 };
 
-guchar FriBidiPropertyBlockf800[256] = {
-  NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
-  NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
-  NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
-  NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
-  NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
-  NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
-  NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
-  NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
-  NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
-  NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
-  NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
-  NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
-  NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
-  NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
-  NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
-  NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,NSM,
-};
-
 guchar FriBidiPropertyBlockfb00[256] = {
   LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,
   LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,LTR,RTL,NSM,RTL,
@@ -672,7 +653,7 @@ guchar FriBidiPropertyBlockff00[256] = {
   ON ,ON ,ON ,ON ,ON ,ON ,ON ,ON ,ON ,BN ,BN ,BN ,ON ,ON ,ON ,ON ,
 };
 
-/* 34 blocks defined */
+/* 33 blocks defined */
 
 guchar *FriBidiPropertyBlocks[256] = {
   FriBidiPropertyBlock0000,
@@ -923,7 +904,7 @@ guchar *FriBidiPropertyBlocks[256] = {
   FriBidiPropertyBlock0100,
   FriBidiPropertyBlock0100,
   FriBidiPropertyBlock0100,
-  FriBidiPropertyBlockf800,
+  FriBidiPropertyBlock0100,
   FriBidiPropertyBlock0100,
   FriBidiPropertyBlock0100,
   FriBidiPropertyBlockfb00,