sequencer: rename reset_for_rollback to reset_merge

diff --git a/decorate.h b/decorate.h
index 9014c1e996c60d9b3e1bd27ffa01b9c2d0c8ae80..ee43dee1f008882094ca9c85f6b28b86ec88fdf6 100644 (file)
--- a/decorate.h
+++ b/decorate.h
@@ -50,12 +50,12 @@ struct decoration {
  * NULL), returning the previously associated pointer. If there is no previous
  * association, this function returns NULL.
  */
-extern void *add_decoration(struct decoration *n, const struct object *obj, void *decoration);
+void *add_decoration(struct decoration *n, const struct object *obj, void *decoration);
 
 /*
  * Return the pointer associated to the given object. If there is no
  * association, this function returns NULL.
  */
-extern void *lookup_decoration(struct decoration *n, const struct object *obj);
+void *lookup_decoration(struct decoration *n, const struct object *obj);
 
 #endif