#
#
# patch "cmd_files.cc"
#  from [b27d724ed5811101b9a33fc6a0cb597c92fd33bb]
#    to [bb01e1a9aa20dbb1ef8361807ab78fad579ffd35]
# 
# patch "cmd_key_cert.cc"
#  from [b58fe9546c29f9c93261c88d774fba41072ce002]
#    to [e90816480e220e06e9050383e169b247defb68bf]
# 
# patch "cmd_list.cc"
#  from [bc24e16d61787c294b125a19bfc3c9174ac0bef2]
#    to [bd12d9df9a26a4fc189681a3a374a211357ab9d2]
# 
# patch "lcs.cc"
#  from [0da7159e06ef043f749c24e4a69ef51792ee33bf]
#    to [d8c5af8949518e9da3c0fa6a5d34c2acb47dec9a]
# 
# patch "lru_writeback_cache.hh"
#  from [89019a43e4752eb55ad759e5064a8d4e33358381]
#    to [615df6d41efa986779fcf78b3dab09c8217ea18a]
# 
# patch "lua.cc"
#  from [b020ff7dab1928b9a8981aa85be9323cdea824ac]
#    to [860c0ee46dab5823bf02798060110da38228c6e5]
# 
# patch "netsync.cc"
#  from [50b0ee5fa1808bdcf31ff87cf3c5716c9d2ad009]
#    to [1e875fe8ba23a5c956819d1d81b7322feff2682f]
# 
# patch "netxx/address.cxx"
#  from [1af16090bb0be1d6b8903ffbc1d43388e3522804]
#    to [815825031b6fa85cd0e33b5570b83b21aa99bca7]
# 
# patch "netxx/peer.cxx"
#  from [86cab6617c37d0b1611237f83c3bb45ab19fe3ef]
#    to [beec7d4114622fc454069f3ed4d6aa03b44ab6f0]
# 
# patch "netxx_pipe.cc"
#  from [3fa376f09fb6fe19cb49562d8cbe71b79b95eeb3]
#    to [972e9926aff9a75ac7c8db77dfc62fcc9be1ca37]
# 
# patch "tester.cc"
#  from [1247551ac69ba7a01cf6cbf50cd3935fe39bfe92]
#    to [15a36dfef03be38ba1725b809c81d27759513863]
# 
# patch "unix/fs.cc"
#  from [cd9e8aaf042821685c0f1cbdc0352fb54357daed]
#    to [d17315d8edc87dc08e7b6073b88188deda98f8c9]
# 
# patch "unix/tester-plaf.cc"
#  from [2ca5dcb66ac86f2e1632055c5973089d1b9d78ae]
#    to [3b9d44f7fc310b27e9e7c9cb848543c4e7f13b29]
# 
# patch "xdelta.cc"
#  from [d17efefc2d804088f5dc02c888c5f4a8536d7e17]
#    to [79962de38df4229c73bf840092fdb177a116c92d]
#
============================================================
--- cmd_files.cc	b27d724ed5811101b9a33fc6a0cb597c92fd33bb
+++ cmd_files.cc	bb01e1a9aa20dbb1ef8361807ab78fad579ffd35
@@ -9,6 +9,7 @@
 
 #include "base.hh"
 #include <iostream>
+#include <iterator>
 
 #include "annotate.hh"
 #include "revision.hh"
============================================================
--- cmd_key_cert.cc	b58fe9546c29f9c93261c88d774fba41072ce002
+++ cmd_key_cert.cc	e90816480e220e06e9050383e169b247defb68bf
@@ -11,6 +11,7 @@
 #include <iostream>
 #include <sstream>
 #include <fstream>
+#include <iterator>
 
 #include "cert.hh"
 #include "charset.hh"
============================================================
--- cmd_list.cc	bc24e16d61787c294b125a19bfc3c9174ac0bef2
+++ cmd_list.cc	bd12d9df9a26a4fc189681a3a374a211357ab9d2
@@ -12,6 +12,7 @@
 #include <map>
 #include <utility>
 #include <iostream>
+#include <iterator>
 
 #include <boost/tuple/tuple.hpp>
 
============================================================
--- lcs.cc	0da7159e06ef043f749c24e4a69ef51792ee33bf
+++ lcs.cc	d8c5af8949518e9da3c0fa6a5d34c2acb47dec9a
@@ -288,7 +288,7 @@ struct jaffer_edit_calculator
     sort(sedits.begin(), sedits.end());
 
     long idx0;
-    for (idx0 = 0; idx0 < cost && sedits[idx0] < 0; ++idx0);
+    for (idx0 = 0; idx0 < cost && sedits[idx0] < 0; ++idx0) ;
     long len_a = max(0L, -sedits[0]);
     long len_b = sedits[cost-1];
 
@@ -352,11 +352,11 @@ struct jaffer_edit_calculator
 
     for (bdx = end_b - 1, adx = end_a - 1;
          (start_b <= bdx) && (start_a <= adx) && (a[adx] == b[bdx]);
-         --bdx, --adx);
+         --bdx, --adx) ;
 
     for (bsx = start_b, asx = start_a;
          (bsx < bdx) && (asx < adx) && (a[asx] == b[bsx]);
-         ++bsx, ++asx);
+         ++bsx, ++asx) ;
 
     // we've trimmed; now call diff_to_ez.
 
============================================================
--- lru_writeback_cache.hh	89019a43e4752eb55ad759e5064a8d4e33358381
+++ lru_writeback_cache.hh	615df6d41efa986779fcf78b3dab09c8217ea18a
@@ -102,15 +102,15 @@ public:
   /** @brief Gets the current abstract size of the cache.
    *  @return current size
    */
-  inline const unsigned long size(void) const
+  inline unsigned long size(void) const
   {
     return _curr_size;
   }
 
-  /** @brief Gets the maximum sbstract size of the cache.
+  /** @brief Gets the maximum abstract size of the cache.
    *  @return maximum size
    */
-  inline const unsigned long max_size(void) const
+  inline unsigned long max_size(void) const
   {
     return _max_size;
   }
============================================================
--- lua.cc	b020ff7dab1928b9a8981aa85be9323cdea824ac
+++ lua.cc	860c0ee46dab5823bf02798060110da38228c6e5
@@ -11,6 +11,7 @@
 #include <set>
 #include "vector.hh"
 #include <utility>
+#include <cstring> // strerror, strlen
 
 using std::pair;
 using std::set;
============================================================
--- netsync.cc	50b0ee5fa1808bdcf31ff87cf3c5716c9d2ad009
+++ netsync.cc	1e875fe8ba23a5c956819d1d81b7322feff2682f
@@ -1434,14 +1434,17 @@ session::process_anonymous_cmd(protocol_
       i != all_branches.end(); i++)
     {
       if (their_matcher((*i)()))
-        if (app.opts.use_transport_auth &&
-            !app.lua.hook_get_netsync_read_permitted((*i)()))
-          {
-            error(not_permitted,
-                  (F("anonymous access to branch '%s' denied by server") % *i).str());
-          }
-        else
-          ok_branches.insert(*i);
+        {
+          if (app.opts.use_transport_auth &&
+              !app.lua.hook_get_netsync_read_permitted((*i)()))
+            {
+              error(not_permitted,
+                    (F("anonymous access to branch '%s' denied by server")
+                     % *i).str());
+            }
+          else
+            ok_branches.insert(*i);
+        }
     }
 
   if (app.opts.use_transport_auth)
============================================================
--- netxx/address.cxx	1af16090bb0be1d6b8903ffbc1d43388e3522804
+++ netxx/address.cxx	815825031b6fa85cd0e33b5570b83b21aa99bca7
@@ -46,6 +46,7 @@
 
 // standard includes
 #include <cstdlib>
+#include <cstring>
 
 //####################################################################
 namespace 
============================================================
--- netxx/peer.cxx	86cab6617c37d0b1611237f83c3bb45ab19fe3ef
+++ netxx/peer.cxx	beec7d4114622fc454069f3ed4d6aa03b44ab6f0
@@ -44,6 +44,7 @@
 #include <algorithm>
 #include <iostream>
 #include <cstdlib>
+#include <cstring>
 #include <new>
 
 //####################################################################
============================================================
--- netxx_pipe.cc	3fa376f09fb6fe19cb49562d8cbe71b79b95eeb3
+++ netxx_pipe.cc	972e9926aff9a75ac7c8db77dfc62fcc9be1ca37
@@ -23,6 +23,7 @@
 #include <fcntl.h>
 #include <sys/wait.h>
 #include <errno.h>
+#include <cstring> // strerror
 #endif
 
 using std::vector;
@@ -336,7 +337,7 @@ Netxx::PipeStream::close (void)
   writefd = -1;
 
   if (child)
-    while (waitpid(child,0,0) == -1 && errno == EINTR);
+    while (waitpid(child,0,0) == -1 && errno == EINTR) ;
   child = 0;
 #endif
 }
============================================================
--- tester.cc	1247551ac69ba7a01cf6cbf50cd3935fe39bfe92
+++ tester.cc	15a36dfef03be38ba1725b809c81d27759513863
@@ -5,6 +5,7 @@
 #include "vector.hh"
 #include "sanity.hh"
 #include <boost/lexical_cast.hpp>
+#include <cstring>
 
 using std::string;
 using std::map;
============================================================
--- unix/fs.cc	cd9e8aaf042821685c0f1cbdc0352fb54357daed
+++ unix/fs.cc	d17315d8edc87dc08e7b6073b88188deda98f8c9
@@ -12,6 +12,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
============================================================
--- unix/tester-plaf.cc	2ca5dcb66ac86f2e1632055c5973089d1b9d78ae
+++ unix/tester-plaf.cc	3b9d44f7fc310b27e9e7c9cb848543c4e7f13b29
@@ -11,6 +11,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <signal.h>
+#include <string.h>
 #include <map>
 
 using std::string;
============================================================
--- xdelta.cc	d17efefc2d804088f5dc02c888c5f4a8536d7e17
+++ xdelta.cc	79962de38df4229c73bf840092fdb177a116c92d
@@ -29,6 +29,7 @@
 #include "vector.hh"
 #include <set>
 #include <sstream>
+#include <cstring>  // memcmp
 
 #include <boost/shared_ptr.hpp>
 #include <boost/version.hpp>