diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0eed99854e..22456f2e49 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-19  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+	* windows-tdep.c (windows_get_tlb_type): Change current_seh.handle
+	type to void function.
+
 2010-04-19  Stan Shebs  <stan@codesourcery.com>
 	    Vladimir Prus  <vladimir@codesourcery.com>
 
diff --git a/gdb/windows-tdep.c b/gdb/windows-tdep.c
index ba0fba9fa4..50dfbe21c9 100644
--- a/gdb/windows-tdep.c
+++ b/gdb/windows-tdep.c
@@ -133,7 +133,8 @@ windows_get_tlb_type (struct gdbarch *gdbarch)
   TYPE_TARGET_TYPE (seh_ptr_type) = seh_type;
 
   append_composite_type_field (seh_type, "next_seh", seh_ptr_type);
-  append_composite_type_field (seh_type, "handler", void_ptr_type);
+  append_composite_type_field (seh_type, "handler",
+			       builtin_type (gdbarch)->builtin_func_ptr);
 
   /* struct _PEB_LDR_DATA */
   peb_ldr_type = arch_composite_type (gdbarch, NULL, TYPE_CODE_STRUCT);