diff -r -u fribidi-0.19.2-old/bin/fribidi-benchmark.c fribidi-0.19.2-new/bin/fribidi-benchmark.c
--- fribidi-0.19.2-old/bin/fribidi-benchmark.c	2006-01-31 03:23:12 +0000
+++ fribidi-0.19.2-new/bin/fribidi-benchmark.c	2010-03-25 14:19:21 +0000
@@ -123,12 +123,14 @@
   void
 )
 {
-  struct tms tb;
 #if HAVE_SYS_TIMES_H+0
+  struct tms tb;
+
   times (&tb);
   return 0.01 * tb.tms_utime;
 #else
 #warning Please fill in here to use other functions for determining time.
+  return 0.;
 #endif
 }
 
diff -r -u fribidi-0.19.2-old/lib/Makefile.am fribidi-0.19.2-new/lib/Makefile.am
--- fribidi-0.19.2-old/lib/Makefile.am	2008-02-25 00:04:26 +0000
+++ fribidi-0.19.2-new/lib/Makefile.am	2010-03-25 14:21:13 +0000
@@ -8,10 +8,6 @@
 libfribidi_la_LIBADD = $(MISC_LIBS)
 libfribidi_la_DEPENDENCIES =
 
-if OS_WIN32
-libfribidi_la_LDFLAGS += -export-symbols $(srcdir)/fribidi.def
-endif # OS_WIN32
-
 if FRIBIDI_CHARSETS
 
 AM_CPPFLAGS += -I$(top_srcdir)/charset
diff -r -u fribidi-0.19.2-old/lib/fribidi.def fribidi-0.19.2-new/lib/fribidi.def
--- fribidi-0.19.2-old/lib/fribidi.def	2006-01-14 15:40:30 +0000
+++ fribidi-0.19.2-new/lib/fribidi.def	2010-03-25 14:13:44 +0000
@@ -1,26 +1,48 @@
-fribidi_debug_status
-fribidi_get_bidi_type
-fribidi_get_bidi_type_name
-fribidi_get_bidi_types
-fribidi_get_joining_type
-fribidi_get_joining_type_name
-fribidi_get_joining_types
-fribidi_get_mirror_char
-fribidi_get_par_direction
-fribidi_get_par_embedding_levels
-fribidi_get_type
-fribidi_get_type_internal
-fribidi_join_arabic
-fribidi_log2vis
-fribidi_log2vis_get_embedding_levels
-fribidi_mirroring_status
-fribidi_remove_bidi_marks
-fribidi_reorder_line
-fribidi_reorder_nsm_status
-fribidi_set_debug
-fribidi_set_mirroring
-fribidi_set_reorder_nsm
-fribidi_shape
-fribidi_shape_mirroring
-fribidi_unicode_version
-fribidi_version_info
+LIBRARY libfribidi-0.dll
+EXPORTS
+fribidi_cap_rtl_to_unicode
+fribidi_char_set_desc
+fribidi_char_set_desc_cap_rtl
+fribidi_char_set_name
+fribidi_char_set_title
+fribidi_charset_to_unicode
+fribidi_cp1255_to_unicode_c
+fribidi_cp1256_to_unicode_c
+fribidi_debug_status
+fribidi_get_bidi_type
+fribidi_get_bidi_type_name
+fribidi_get_bidi_types
+fribidi_get_joining_type
+fribidi_get_joining_type_name
+fribidi_get_joining_types
+fribidi_get_mirror_char
+fribidi_get_par_direction
+fribidi_get_par_embedding_levels
+fribidi_get_type
+fribidi_get_type_internal
+fribidi_iso8859_6_to_unicode_c
+fribidi_iso8859_8_to_unicode_c
+fribidi_join_arabic
+fribidi_log2vis
+fribidi_log2vis_get_embedding_levels
+fribidi_mirroring_status
+fribidi_parse_charset
+fribidi_remove_bidi_marks
+fribidi_reorder_line
+fribidi_reorder_nsm_status
+fribidi_set_debug
+fribidi_set_mirroring
+fribidi_set_reorder_nsm
+fribidi_shape
+fribidi_shape_arabic
+fribidi_shape_mirroring
+fribidi_unicode_to_cap_rtl
+fribidi_unicode_to_charset
+fribidi_unicode_to_cp1255_c
+fribidi_unicode_to_cp1256_c
+fribidi_unicode_to_iso8859_6_c
+fribidi_unicode_to_iso8859_8_c
+fribidi_unicode_to_utf8
+fribidi_unicode_version DATA
+fribidi_utf8_to_unicode
+fribidi_version_info
diff -r -u fribidi-0.19.2-old/test/run.tests fribidi-0.19.2-new/test/run.tests
--- fribidi-0.19.2-old/test/run.tests	2005-11-15 20:04:02 +0000
+++ fribidi-0.19.2-new/test/run.tests	2010-03-25 14:20:24 +0000
@@ -54,9 +54,19 @@
   fi
   "$top_builddir/bin/fribidi" --test --charset "$charset" "$testcase" > "$test.output"
 
+  os=`uname -s`
+  case "$os" in
+    MINGW32*)
+      diff_prog="diff --strip-trailing-cr"
+      ;;
+    *)
+      diff_prog="diff"
+      ;;
+  esac
+
   reference="${testcase%.input}.reference";
   test -f "$reference" || reference="tests/${reference##*/}"
-  if diff -U 0 "$test.output" "$reference"; then
+  if $diff_prog -U 0 "$test.output" "$reference"; then
     rm "$test.output"
     echo " [Passed]"
     return 0