--- a/src/database.c	Mon Aug 13 09:11:41 2007 +0200
+++ b/src/database.c	Mon Aug 13 09:12:09 2007 +0200
@@ -71,7 +71,7 @@
   XEMACS_DB_TYPE type;
   int mode;
   int ackcess;
-  int errno;
+  int dberrno;
   void *db_handle;
   DB_FUNCS *funcs;
 };
@@ -100,7 +100,7 @@
   dbase->db_handle = NULL;
   dbase->ackcess = 0;
   dbase->mode = 0;
-  dbase->errno = 0;
+  dbase->dberrno = 0;
   dbase->type = DB_UNKNOWN;
   return (dbase);
 }
@@ -322,7 +322,7 @@
 static Lisp_Object
 dbm_lasterr (struct database_struct *dbp)
 {
-  char *temp = strerror (dbp->errno);
+  char *temp = strerror (dbp->dberrno);
   return (make_string ((unsigned char *) temp, strlen (temp)));
 }
 
@@ -405,7 +405,7 @@
 static Lisp_Object
 berkdb_lasterr (struct database_struct *dbp)
 {
-  char *temp = strerror (dbp->errno);
+  char *temp = strerror (dbp->dberrno);
   return (make_string ((unsigned char *) temp, strlen (temp)));
 }
 
@@ -424,7 +424,7 @@
   if (!status)
     return (make_string (valdatum.data, valdatum.size));
 
-  db->errno = (status == 1) ? -1 : errno;
+  db->dberrno = (status == 1) ? -1 : errno;
   return (Qnil);
 }
 
@@ -444,7 +444,7 @@
   valdatum.size = XSTRING_LENGTH (val);
   status = dbp->put (dbp, &keydatum, &valdatum, NILP (replace)
 		     ? R_NOOVERWRITE : 0);
-  db->errno = (status == 1) ? -1 : errno;
+  db->dberrno = (status == 1) ? -1 : errno;
   return status;
 }
 
@@ -462,7 +462,7 @@
   if (!status)
     return 0;
   
-  db->errno = (status == 1) ? -1 : errno;
+  db->dberrno = (status == 1) ? -1 : errno;
   return 1;
 }