updated error C2059: syntax error : '}' Intializing a struct with empty

2006-08-17  Hans Breuer  <hans@breuer.org>

	* pango/makefile.msc pango/pango.def : updated
	* pango/break.c(1630) : error C2059: syntax error : '}' Intializing a
	struct with empty braces is not supported with MSVC, instead use 0.
	* pango/pangocairo.def : removed pango_fc_font_(map_)get_type
	pangocairo has either win32 fonts or freetype. The former is more usual.
	* pango/pango-utils.c : replaced M_PI by G_PI (from glib/gtypes.h).

5 files changed, 15 insertions, 12 deletions

diff --git a/pango/break.c b/pango/break.c
index 9e9b2b75..b8a47ccd 100644
--- a/pango/break.c
+++ b/pango/break.c
@@ -1627,7 +1627,7 @@ pango_get_log_attrs (const char    *text,
   int chars_in_range;
   static guint engine_type_id = 0;
   static guint render_type_id = 0;
-  PangoAnalysis analysis = {};
+  PangoAnalysis analysis = { 0 };
 
   analysis.level = level;
 
diff --git a/pango/makefile.msc b/pango/makefile.msc
index 4962b38d..8caaad39 100644
--- a/pango/makefile.msc
+++ b/pango/makefile.msc
@@ -104,6 +104,7 @@ OBJECTS = \
 	pango-glyph-item.obj \
 	pango-item.obj \
 	pango-markup.obj \
+	pango-matrix.obj \
 	pango-layout.obj \
 	pango-renderer.obj \
 	pango-script.obj \
@@ -154,6 +155,11 @@ OBJECTS = \
 	pangoft2.obj \
 	pangoft2-fontmap.obj \
 	pangoft2-render.obj \
+	\
+	pango-ot-buffer.obj \
+	pango-ot-info.obj \
+	pango-ot-ruleset.obj \
+	\
 	basic-fc.obj
 
 PKG_CFLAGS = $(PKG_CFLAGS) $(FONTCONFIG_CFLAGS) $(FREETYPE2_CFLAGS)
diff --git a/pango/pango-utils.c b/pango/pango-utils.c
index 5e1fccdc..81700d2a 100644
--- a/pango/pango-utils.c
+++ b/pango/pango-utils.c
@@ -1647,9 +1647,9 @@ pango_gravity_to_rotation (PangoGravity gravity)
     {
       default:
       case PANGO_GRAVITY_SOUTH:	rotation =  0;		break;
-      case PANGO_GRAVITY_NORTH:	rotation =  M_PI;	break;
-      case PANGO_GRAVITY_EAST:	rotation = -M_PI_2;	break;
-      case PANGO_GRAVITY_WEST:	rotation = +M_PI_2;	break;
+      case PANGO_GRAVITY_NORTH:	rotation =  G_PI;	break;
+      case PANGO_GRAVITY_EAST:	rotation = -G_PI_2;	break;
+      case PANGO_GRAVITY_WEST:	rotation = +G_PI_2;	break;
     }
 
   return rotation;
diff --git a/pango/pango.def b/pango/pango.def
index 32576db6..b385fa3d 100644
--- a/pango/pango.def
+++ b/pango/pango.def
@@ -51,9 +51,9 @@ EXPORTS
 	pango_color_parse
 	pango_config_key_get
 	pango_context_get_base_dir
-	pango_context_get_base_gravity
 	pango_context_get_font_description
 	pango_context_get_font_map
+	pango_context_get_base_gravity
 	pango_context_get_language
 	pango_context_get_matrix
 	pango_context_get_metrics
@@ -63,9 +63,9 @@ EXPORTS
 	pango_context_load_fontset
 	pango_context_new
 	pango_context_set_base_dir
-	pango_context_set_base_gravity
 	pango_context_set_font_description
 	pango_context_set_font_map
+	pango_context_set_base_gravity
 	pango_context_set_language
 	pango_context_set_matrix
 	pango_coverage_copy
@@ -179,8 +179,6 @@ EXPORTS
 	pango_glyph_string_new
 	pango_glyph_string_set_size
 	pango_glyph_string_x_to_index
-	pango_gravity_get_type
-	pango_gravity_to_rotation
 	pango_is_zero_width
 	pango_item_copy
 	pango_item_free
@@ -277,7 +275,6 @@ EXPORTS
 	pango_matrix_get_type
 	pango_matrix_rotate
 	pango_matrix_scale
-	pango_matrix_to_gravity
 	pango_matrix_translate
 	pango_module_register
 	pango_parse_markup
@@ -312,7 +309,7 @@ EXPORTS
 	pango_script_get_type
 	pango_script_iter_free
 	pango_script_iter_get_range
-	pango_script_iter_new
+	pango_script_iter_new 
 	pango_script_iter_next
 	pango_shape
 	pango_skip_space
diff --git a/pango/pangocairo.def b/pango/pangocairo.def
index f5e5af32..bebecfe4 100644
--- a/pango/pangocairo.def
+++ b/pango/pangocairo.def
@@ -5,8 +5,8 @@ EXPORTS
 	pango_cairo_context_set_resolution
 	pango_cairo_create_layout
 	pango_cairo_error_underline_path
-	pango_cairo_fc_font_get_type
-	pango_cairo_fc_font_map_get_type
+;	pango_cairo_fc_font_get_type
+;	pango_cairo_fc_font_map_get_type
 	pango_cairo_font_get_type
 	pango_cairo_font_map_create_context
 	pango_cairo_font_map_get_default