diff --git a/ChangeLog b/ChangeLog
index 2611d89d..2b573275 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-04-13  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+
+        Renamed argument from 'errno' to 'err', since errno is confused with
+        errno defined in errno.h.
+        * src/LibgcryptARC4Decryptor.h
+        * src/LibgcryptARC4Context.h
+        * src/LibgcryptDHKeyExchange.h
+        * src/LibgcryptARC4Encryptor.h
+
 2008-04-13  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	Rewritten choking algorithm.
diff --git a/src/LibgcryptARC4Context.h b/src/LibgcryptARC4Context.h
index 7dbfa4f1..db6b2e34 100644
--- a/src/LibgcryptARC4Context.h
+++ b/src/LibgcryptARC4Context.h
@@ -45,10 +45,10 @@ class LibgcryptARC4Context {
 private:
   gcry_cipher_hd_t _cipherCtx;
 
-  void handleError(gcry_error_t errno) const
+  void handleError(gcry_error_t err) const
   {
     throw new DlAbortEx("Exception in libgcrypt routine(ARC4Context class): %s",
-			gcry_strerror(errno));
+			gcry_strerror(err));
   }
 public:
   LibgcryptARC4Context():_cipherCtx(0) {}
diff --git a/src/LibgcryptARC4Decryptor.h b/src/LibgcryptARC4Decryptor.h
index 19e362a5..94745f8a 100644
--- a/src/LibgcryptARC4Decryptor.h
+++ b/src/LibgcryptARC4Decryptor.h
@@ -46,10 +46,10 @@ class ARC4Decryptor {
 private:
   LibgcryptARC4Context _ctx;
 
-  void handleError(gcry_error_t errno) const
+  void handleError(gcry_error_t err) const
   {
     throw new DlAbortEx("Exception in libgcrypt routine(ARC4Decryptor class): %s",
-			gcry_strerror(errno));
+			gcry_strerror(err));
   }
 public:
   ARC4Decryptor() {}
diff --git a/src/LibgcryptARC4Encryptor.h b/src/LibgcryptARC4Encryptor.h
index 2e0c7a16..63343aa5 100644
--- a/src/LibgcryptARC4Encryptor.h
+++ b/src/LibgcryptARC4Encryptor.h
@@ -46,10 +46,10 @@ class ARC4Encryptor {
 private:
   LibgcryptARC4Context _ctx;
 
-  void handleError(gcry_error_t errno) const
+  void handleError(gcry_error_t err) const
   {
     throw new DlAbortEx("Exception in libgcrypt routine(ARC4Encryptor class): %s",
-			gcry_strerror(errno));
+			gcry_strerror(err));
   }
 public:
   ARC4Encryptor() {}
diff --git a/src/LibgcryptDHKeyExchange.h b/src/LibgcryptDHKeyExchange.h
index 871bcda9..4e9cad44 100644
--- a/src/LibgcryptDHKeyExchange.h
+++ b/src/LibgcryptDHKeyExchange.h
@@ -53,10 +53,10 @@ private:
 
   gcry_mpi_t _publicKey;
 
-  void handleError(int errno) const
+  void handleError(gcry_error_t err) const
   {
     throw new DlAbortEx("Exception in libgcrypt routine(DHKeyExchange class): %s",
-			gcry_strerror(errno));
+			gcry_strerror(err));
   }
 public:
   DHKeyExchange():