diff --git a/include/Support/Annotation.h b/include/Support/Annotation.h
index 933ca19db3d..c444ce60662 100644
--- a/include/Support/Annotation.h
+++ b/include/Support/Annotation.h
@@ -176,7 +176,8 @@ struct AnnotationManager {
   // Annotable::getOrCreateAnnotation method.
   //
   static void registerAnnotationFactory(AnnotationID ID, 
-                          Annotation *(*Func)(AnnotationID, Annotable *));
+                          Annotation *(*Func)(AnnotationID, Annotable *, void*),
+					void *ExtraData = 0);
 
   // createAnnotation - Create an annotation of the specified ID for the
   // specified object, using a register annotation creation function.
diff --git a/include/llvm/Annotation.h b/include/llvm/Annotation.h
index 933ca19db3d..c444ce60662 100644
--- a/include/llvm/Annotation.h
+++ b/include/llvm/Annotation.h
@@ -176,7 +176,8 @@ struct AnnotationManager {
   // Annotable::getOrCreateAnnotation method.
   //
   static void registerAnnotationFactory(AnnotationID ID, 
-                          Annotation *(*Func)(AnnotationID, Annotable *));
+                          Annotation *(*Func)(AnnotationID, Annotable *, void*),
+					void *ExtraData = 0);
 
   // createAnnotation - Create an annotation of the specified ID for the
   // specified object, using a register annotation creation function.
diff --git a/include/llvm/Support/Annotation.h b/include/llvm/Support/Annotation.h
index 933ca19db3d..c444ce60662 100644
--- a/include/llvm/Support/Annotation.h
+++ b/include/llvm/Support/Annotation.h
@@ -176,7 +176,8 @@ struct AnnotationManager {
   // Annotable::getOrCreateAnnotation method.
   //
   static void registerAnnotationFactory(AnnotationID ID, 
-                          Annotation *(*Func)(AnnotationID, Annotable *));
+                          Annotation *(*Func)(AnnotationID, Annotable *, void*),
+					void *ExtraData = 0);
 
   // createAnnotation - Create an annotation of the specified ID for the
   // specified object, using a register annotation creation function.