#
#
# patch "platform.hh"
#  from [4e365da03e2a355049edd28ae3a65aa78de65cfd]
#    to [3f3e42cdc841892c1e0e5e53e8041959defbe2ed]
# 
# patch "rcs_file.cc"
#  from [03010605b87bfa54cd3a78996c7e0750d2a9fe81]
#    to [3846fcd9f03c09140267d0da6e9ac3aacce284ff]
# 
# patch "schema_migration.cc"
#  from [5cdc15083da2f750656c800c1b8a37fbedfb849b]
#    to [72a441aa9b77bdd8661c66e47d238ac4a7aa2b57]
# 
# patch "unix/ssh_agent_platform.cc"
#  from [4158f7f58999359c9c5a9f28713091ac1ea824ef]
#    to [137b548f371397b3c74bd4c11d551ce8edaf3a6c]
#
============================================================
--- platform.hh	4e365da03e2a355049edd28ae3a65aa78de65cfd
+++ platform.hh	3f3e42cdc841892c1e0e5e53e8041959defbe2ed
@@ -16,6 +16,7 @@
 #include "config.h"
 
 #include <string>
+#include <stdio.h>
 
 void read_password(std::string const & prompt, char * buf, size_t bufsz);
 void get_system_flavour(std::string & ident);
============================================================
--- rcs_file.cc	03010605b87bfa54cd3a78996c7e0750d2a9fe81
+++ rcs_file.cc	3846fcd9f03c09140267d0da6e9ac3aacce284ff
@@ -18,6 +18,9 @@
 #endif
 
 #ifdef HAVE_MMAP
+#ifdef sun
+#define _XPG4_2
+#endif
 #include <sys/mman.h>
 #endif
 
============================================================
--- schema_migration.cc	5cdc15083da2f750656c800c1b8a37fbedfb849b
+++ schema_migration.cc	72a441aa9b77bdd8661c66e47d238ac4a7aa2b57
@@ -10,6 +10,7 @@
 #include <boost/tokenizer.hpp>
 #include <boost/lexical_cast.hpp>
 #include <sqlite3.h>
+#include <string.h>
 
 #include "sanity.hh"
 #include "schema_migration.hh"
============================================================
--- unix/ssh_agent_platform.cc	4158f7f58999359c9c5a9f28713091ac1ea824ef
+++ unix/ssh_agent_platform.cc	137b548f371397b3c74bd4c11d551ce8edaf3a6c
@@ -11,6 +11,7 @@
 #include <sys/socket.h>
 #include <fcntl.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "../sanity.hh"