#
# old_revision [880df7b506faa1ac84871b84629616a66bc02b84]
#
# patch "src/base.hh"
#  from [2c6f22801aef99bb44b173fba7e4564ae4d9b95f]
#    to [d72afd0ce3c8c34d275d0b508e284b3618a572e6]
# 
# patch "src/gzip.cc"
#  from [9d7f68b36bf9039a8138317603abe37db5451d66]
#    to [7872a4ddd5d805731cfaba0a7ff743224763f3fc]
#
============================================================
--- src/base.hh	2c6f22801aef99bb44b173fba7e4564ae4d9b95f
+++ src/base.hh	d72afd0ce3c8c34d275d0b508e284b3618a572e6
@@ -97,6 +97,10 @@ template <> void dump(unsigned long long
 #define _(str) gettext(str)
 #define N_(str) gettext_noop(str)
 
+// include it here so that it gets loaded before "sanity.hh"
+// as it defines an "E" macro which conflicts with it
+#include "botan/exceptn.h"
+
 #endif // __BASE_HH__
 
 // Local Variables:
============================================================
--- src/gzip.cc	9d7f68b36bf9039a8138317603abe37db5451d66
+++ src/gzip.cc	7872a4ddd5d805731cfaba0a7ff743224763f3fc
@@ -88,7 +88,7 @@ Gzip_Compression::Gzip_Compression(u32bi
 * Gzip_Compression Constructor                   *
 *************************************************/
 Gzip_Compression::Gzip_Compression(u32bit l) :
-   level((l >= 9) ? 9 : l), buffer(DEFAULT_BUFFERSIZE),
+   level((l >= 9) ? 9 : l), buffer(BOTAN_DEFAULT_BUFFER_SIZE),
    pipe(new Hash_Filter("CRC32")), count( 0 )
    {
 
@@ -220,11 +220,11 @@ void Gzip_Compression::put_footer()
 /*************************************************
 * Gzip_Decompression Constructor                 *
 *************************************************/
-Gzip_Decompression::Gzip_Decompression() : buffer(DEFAULT_BUFFERSIZE),
+Gzip_Decompression::Gzip_Decompression() : buffer(BOTAN_DEFAULT_BUFFER_SIZE),
    no_writes(true), pipe(new Hash_Filter("CRC32")), footer(0)
    {
-   if (DEFAULT_BUFFERSIZE < sizeof(GZIP::GZIP_HEADER))
-      throw Decoding_Error("DEFAULT_BUFFERSIZE is too small");
+   if (BOTAN_DEFAULT_BUFFER_SIZE < sizeof(GZIP::GZIP_HEADER))
+      throw Decoding_Error("BOTAN_DEFAULT_BUFFER_SIZE is too small");
 
    zlib = new Zlib_Stream;