# 
# patch "transforms.hh"
#  from [c20250278e8f0c6d1d2f4ede542ed218d5ba57cd]
#    to [99ee53fa53ee22cbb825b97bd997a68de913b0d3]
# 
# patch "vocab.hh"
#  from [930a79d9ee7aba0064403ec0bf47b3c43036b3b9]
#    to [30521cc298bcafd38bdcc9bab2d24221d8f1d35d]
# 
========================================================================
--- transforms.hh	c20250278e8f0c6d1d2f4ede542ed218d5ba57cd
+++ transforms.hh	99ee53fa53ee22cbb825b97bd997a68de913b0d3
@@ -27,13 +27,19 @@
   class Gzip_Decompression;
 }
 
+#ifdef HAVE_EXTERN_TEMPLATE
+#define EXTERN extern
+#else
+#define EXTERN /* */
+#endif
+
 template<typename XFM> std::string xform(std::string const &);
-extern template std::string xform<Botan::Base64_Encoder>(std::string const &);
-extern template std::string xform<Botan::Base64_Decoder>(std::string const &);
-extern template std::string xform<Botan::Hex_Encoder>(std::string const &);
-extern template std::string xform<Botan::Hex_Decoder>(std::string const &);
-extern template std::string xform<Botan::Gzip_Compression>(std::string const &);
-extern template std::string xform<Botan::Gzip_Decompression>(std::string const &);
+EXTERN template std::string xform<Botan::Base64_Encoder>(std::string const &);
+EXTERN template std::string xform<Botan::Base64_Decoder>(std::string const &);
+EXTERN template std::string xform<Botan::Hex_Encoder>(std::string const &);
+EXTERN template std::string xform<Botan::Hex_Decoder>(std::string const &);
+EXTERN template std::string xform<Botan::Gzip_Compression>(std::string const &);
+EXTERN template std::string xform<Botan::Gzip_Decompression>(std::string const &);
 
 // base64 encoding
 
@@ -82,13 +88,13 @@
 
 template <typename T>
 void pack(T const & in, base64< gzip<T> > & out);
-extern template void pack<data>(data const &, base64< gzip<data> > &);
-extern template void pack<delta>(delta const &, base64< gzip<delta> > &);
+EXTERN template void pack<data>(data const &, base64< gzip<data> > &);
+EXTERN template void pack<delta>(delta const &, base64< gzip<delta> > &);
 
 template <typename T>
 void unpack(base64< gzip<T> > const & in, T & out);
-extern template void unpack<data>(base64< gzip<data> > const &, data &);
-extern template void unpack<delta>(base64< gzip<delta> > const &, delta &);
+EXTERN template void unpack<data>(base64< gzip<data> > const &, data &);
+EXTERN template void unpack<delta>(base64< gzip<delta> > const &, delta &);
 
 
 // diffing and patching
========================================================================
--- vocab.hh	930a79d9ee7aba0064403ec0bf47b3c43036b3b9
+++ vocab.hh	30521cc298bcafd38bdcc9bab2d24221d8f1d35d
@@ -108,11 +108,14 @@
 ATOMIC(ty)                                             \
 inline void verify(ty &) {}
 
+#ifdef HAVE_EXTERN_TEMPLATE
 #define EXTERN extern
+#else
+#define EXTERN /* */
+#endif
 
 #include "vocab_terms.hh"
 
-#undef EXTERN
 #undef ATOMIC
 #undef ATOMIC_NOVERIFY
 #undef DECORATE
@@ -147,10 +150,12 @@
 // kludge: certs are derived types. what else can we do?
 #ifndef __CERT_HH__
 #include "cert.hh"
-extern template class revision<cert>;
-extern template class manifest<cert>;
+EXTERN template class revision<cert>;
+EXTERN template class manifest<cert>;
 #endif
 
+#undef EXTERN
+
 // diff type
 enum diff_type
 {