#
#
# patch "Makefile.am"
#  from [cc098fcd7d979e7002ab949e577ce5d6ba022dfa]
#    to [4cb9a224471a98a0d228ee5233cb22b4fbb2032b]
# 
# patch "database.cc"
#  from [919c86a974c2bc086887671718ff74983bb7584f]
#    to [1d015db8c66b3d39c37b2bb7b759f5b21854a6b8]
# 
# patch "rev_types.hh"
#  from [9a3a1a69643278a8b2c5c6c85d25623ae079227c]
#    to [99327382c7c617bc5965569a55d7789d95b0fa99]
# 
# patch "roster.cc"
#  from [38bff54f750d3610ca41b34b402b91be6e52e0b2]
#    to [fb75b64486d9f56ab06f450966ab3e061d01739c]
#
============================================================
--- Makefile.am	cc098fcd7d979e7002ab949e577ce5d6ba022dfa
+++ Makefile.am	4cb9a224471a98a0d228ee5233cb22b4fbb2032b
@@ -404,7 +404,7 @@ lib3rdparty_a_CPPFLAGS =
 AM_LDFLAGS =
 
 lib3rdparty_a_CPPFLAGS =
-lib3rdparty_a_CFLAGS = $(AM_CFLAGS) $(LIB3RDPARTY_CFLAGS) -fpermissive
+lib3rdparty_a_CFLAGS = $(AM_CFLAGS) $(LIB3RDPARTY_CFLAGS)
 lib3rdparty_a_CXXFLAGS = $(AM_CXXFLAGS) $(LIB3RDPARTY_CXXFLAGS) -fpermissive
 
 mtn_LDFLAGS =
============================================================
--- database.cc	919c86a974c2bc086887671718ff74983bb7584f
+++ database.cc	1d015db8c66b3d39c37b2bb7b759f5b21854a6b8
@@ -321,11 +321,6 @@ private:
   void put_roster_delta(revision_id const & ident,
                         revision_id const & base,
                         roster_delta const & del);
-  void put_version(file_id const & old_id,
-                   file_id const & new_id,
-                   delta const & del,
-                   string const & data_table,
-                   string const & delta_table);
 
   //
   // --== The ancestry graph ==--
============================================================
--- rev_types.hh	9a3a1a69643278a8b2c5c6c85d25623ae079227c
+++ rev_types.hh	99327382c7c617bc5965569a55d7789d95b0fa99
@@ -31,7 +31,6 @@ namespace basic_io
 }
 
 // full definitions in cset.hh 
-typedef std::map<attr_key, attr_value> attr_map_t;
 typedef u32 node_id;
 struct cset;
 struct editable_tree;
============================================================
--- roster.cc	38bff54f750d3610ca41b34b402b91be6e52e0b2
+++ roster.cc	fb75b64486d9f56ab06f450966ab3e061d01739c
@@ -3062,11 +3062,6 @@ attr_key pick_attr(full_attr_map_t const
   return random_element(attrs, rng)->first;
 }
 
-attr_key pick_attr(attr_map_t const & attrs, randomizer & rng)
-{
-  return random_element(attrs, rng)->first;
-}
-
 bool parent_of(file_path const & p,
                file_path const & c)
 {