From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 1 May 2006 08:18:44 +0000 (+0000)
Subject: - Work on getting wx-console building on MinGW. wxWidgets now builds
X-Git-Tag: Release-7.0.0~8005
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=73dcee6fd9333f976f86252d35d290710f85014c;p=bacula%2Fbacula

- Work on getting wx-console building on MinGW. wxWidgets now builds
  started adding Makefile ...
- Moved MinGW library objects to src/win32/lib to reduce clutter.


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2991 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/kes-1.39 b/bacula/kes-1.39
index c3f8eb10f0..49fd0bdd29 100644
--- a/bacula/kes-1.39
+++ b/bacula/kes-1.39
@@ -2,8 +2,13 @@
                         Kern Sibbald
 
 General:
+01Ma06
+- Work on getting wx-console building on MinGW. wxWidgets now builds
+  started adding Makefile ...
+- Moved MinGW library objects to src/win32/lib to reduce clutter.
 30Apr06
 - Reloading a bad configuration file doesn't kill director any more.
+  Thanks to fix from Eric Bollengier.
 29Apr06
 - Fix problem of accents with new Win32 code.
 - Integrate Howard's VSS patch. Tweak it a bit. VSS now
diff --git a/bacula/src/lib/alloc.c b/bacula/src/lib/alloc.c
index 8de592cf1d..ae48a615a1 100644
--- a/bacula/src/lib/alloc.c
+++ b/bacula/src/lib/alloc.c
@@ -1,27 +1,22 @@
 /*
 
-	Error checking memory allocator
+        Error checking memory allocator
 
      Version $Id$
 */
 
 /*
-   Copyright (C) 2000-2004 Kern Sibbald and John Walker
+   Copyright (C) 2000-2006 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   modify it under the terms of the GNU General Public License
+   version 2 as amended with additional clauses defined in the
+   file LICENSE in the main source directory.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
 
  */
 
@@ -37,7 +32,7 @@
 
 /*LINTLIBRARY*/
 
-#define V	 (void)
+#define V        (void)
 
 #ifdef SMARTALLOC
 
@@ -47,16 +42,16 @@ extern void *sm_malloc();
 
 void *sm_alloc(char *fname, int lineno, unsigned int nbytes)
 {
-	void *buf;
-
-	if ((buf = sm_malloc(fname, lineno, nbytes)) != NULL) {
-	   return buf;
-	}
-	V fprintf(stderr, "\nBoom!!!  Memory capacity exceeded.\n");
-	V fprintf(stderr, "  Requested %u bytes at line %d of %s.\n",
-	   nbytes, lineno, fname);
-	abort();
-	/*NOTREACHED*/
+   void *buf;
+
+   if ((buf = sm_malloc(fname, lineno, nbytes)) != NULL) {
+      return buf;
+   }
+   V fprintf(stderr, "\nBoom!!!  Memory capacity exceeded.\n");
+   V fprintf(stderr, "  Requested %u bytes at line %d of %s.\n",
+      nbytes, lineno, fname);
+   abort();
+   /*NOTREACHED*/
 }
 #else
 
@@ -64,15 +59,15 @@ void *sm_alloc(char *fname, int lineno, unsigned int nbytes)
 
 void *alloc(unsigned int nbytes)
 {
-	void *buf;
-
-	if ((buf = malloc(nbytes)) != NULL) {
-	   return buf;
-	}
-	V fprintf(stderr, "\nBoom!!!  Memory capacity exceeded.\n");
-	V fprintf(stderr, "  Requested %u bytes.\n", nbytes);
-	abort();
-	/*NOTREACHED*/
+   void *buf;
+
+   if ((buf = malloc(nbytes)) != NULL) {
+      return buf;
+   }
+   V fprintf(stderr, "\nBoom!!!  Memory capacity exceeded.\n");
+   V fprintf(stderr, "  Requested %u bytes.\n", nbytes);
+   abort();
+   /*NOTREACHED*/
 }
 #endif
 #endif
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 3f7d9def04..5da1b34b88 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "1.39.10"
-#define BDATE   "29 April 2006"
-#define LSMDATE "29Apr06"
+#define BDATE   "01 May 2006"
+#define LSMDATE "01May06"
 
 /* Debug flags */
 #undef  DEBUG