From 35be7e1d2261822f4e7030ee7f4c7b571f125347 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 22 Apr 2006 09:13:07 +0000
Subject: [PATCH] Integrate most of the MinGW changes -- more to do.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2957 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/kes-1.39       |  2 ++
 bacula/src/lib/bsys.c | 12 ++++++++----
 bacula/src/version.h  |  4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/bacula/kes-1.39 b/bacula/kes-1.39
index e4cfdb04f1..6e80941f73 100644
--- a/bacula/kes-1.39
+++ b/bacula/kes-1.39
@@ -2,6 +2,8 @@
                         Kern Sibbald
 
 General:
+22Apr06
+- Integrate most of the MinGW changes -- more to do.
 21Apr06
 - Implement using pg_config for finding PostgreSQL files.
   Fixes bug #600. Patch supplied by user.
diff --git a/bacula/src/lib/bsys.c b/bacula/src/lib/bsys.c
index c620740a5a..548ab97b2a 100644
--- a/bacula/src/lib/bsys.c
+++ b/bacula/src/lib/bsys.c
@@ -183,7 +183,8 @@ void *bmalloc(size_t size)
 
   buf = malloc(size);
   if (buf == NULL) {
-     Emsg1(M_ABORT, 0, _("Out of memory: ERR=%s\n"), strerror(errno));
+     berrno be;
+     Emsg1(M_ABORT, 0, _("Out of memory: ERR=%s\n"), be.strerror());
   }
   return buf;
 }
@@ -199,7 +200,8 @@ void *b_malloc(const char *file, int line, size_t size)
   buf = malloc(size);
 #endif
   if (buf == NULL) {
-     e_msg(file, line, M_ABORT, 0, _("Out of memory: ERR=%s\n"), strerror(errno));
+     berrno be;
+     e_msg(file, line, M_ABORT, 0, _("Out of memory: ERR=%s\n"), be.strerror());
   }
   return buf;
 }
@@ -209,7 +211,8 @@ void *brealloc (void *buf, size_t size)
 {
    buf = realloc(buf, size);
    if (buf == NULL) {
-      Emsg1(M_ABORT, 0, _("Out of memory: ERR=%s\n"), strerror(errno));
+      berrno be;
+      Emsg1(M_ABORT, 0, _("Out of memory: ERR=%s\n"), be.strerror());
    }
    return buf;
 }
@@ -221,7 +224,8 @@ void *bcalloc (size_t size1, size_t size2)
 
    buf = calloc(size1, size2);
    if (buf == NULL) {
-      Emsg1(M_ABORT, 0, _("Out of memory: ERR=%s\n"), strerror(errno));
+      berrno be;
+      Emsg1(M_ABORT, 0, _("Out of memory: ERR=%s\n"), be.strerror());
    }
    return buf;
 }
diff --git a/bacula/src/version.h b/bacula/src/version.h
index d69c836562..703fd04794 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "1.39.9"
-#define BDATE   "21 April 2006"
-#define LSMDATE "21Apr06"
+#define BDATE   "22 April 2006"
+#define LSMDATE "22Apr06"
 
 /* Debug flags */
 #undef  DEBUG
-- 
2.39.5