# 
# patch "ChangeLog"
#  from [df3449d3918b3cf7a0c5ff2505ec3b64fb9e7c31]
#    to [c284932b2885271824e03b5235995663567a48d9]
# 
# patch "botan/gzip.cpp"
#  from [1934b47be42d6f7ff115d17fbc07c1efcfa3723f]
#    to [2161328a84b2cfa13908e4cfadec19a072bfde89]
# 
# patch "botan/mutex.cpp"
#  from [e859827b2dd3a6e6c02c96ef0fe52cc7b52af980]
#    to [5e0337d3e2dbae707c2d873a299e3c403c17962d]
# 
========================================================================
--- ChangeLog	df3449d3918b3cf7a0c5ff2505ec3b64fb9e7c31
+++ ChangeLog	c284932b2885271824e03b5235995663567a48d9
@@ -1,5 +1,10 @@
 2005-08-13  Patrick Mauritz  <address@hidden>
 
+	* botan/gzip.cpp, botan/mutex.cpp: c functions via c* headers need
+	std:: prefix
+
+2005-08-13  Patrick Mauritz  <address@hidden>
+
 	* schema_migration.cc (lowercase): it's only used for processing sha1
 	values whos size we know: make array size constant
 	* transforms.cc (encode_hexenc, decode_hexenc): they have to work with
========================================================================
--- botan/gzip.cpp	1934b47be42d6f7ff115d17fbc07c1efcfa3723f
+++ botan/gzip.cpp	2161328a84b2cfa13908e4cfadec19a072bfde89
@@ -15,7 +15,6 @@
 #include <botan/gzip.h>
 #include <botan/filters.h>
 #include <cstring>
-#include <string.h>
 #include <map>
 #include <zlib.h>
 
@@ -282,7 +281,7 @@
       if (pos + len - 1 >= GZIP::HEADER_POS_OS)
          cmplen--;
 
-      if (memcmp(input, &GZIP::GZIP_HEADER[pos], cmplen) != 0)
+      if (std::memcmp(input, &GZIP::GZIP_HEADER[pos], cmplen) != 0)
          {
          throw Decoding_Error("Gzip_Decompression: Data integrity error in header");
          }
========================================================================
--- botan/mutex.cpp	e859827b2dd3a6e6c02c96ef0fe52cc7b52af980
+++ botan/mutex.cpp	5e0337d3e2dbae707c2d873a299e3c403c17962d
@@ -6,7 +6,7 @@
 #include <botan/mutex.h>
 #include <botan/exceptn.h>
 #include <botan/init.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 namespace Botan {
 
@@ -39,7 +39,7 @@
    {
    if(locked)
       {
-      abort();
+      std::abort();
       throw Internal_Error("Default_Mutex::lock: Mutex is already locked");
       }
    locked = true;
@@ -52,7 +52,7 @@
    {
    if(!locked)
       {
-      abort();
+      std::abort();
       throw Internal_Error("Default_Mutex::unlock: Mutex is already unlocked");
       }
    locked = false;