Merge branch 'license-fix' of https://github.com/adiknoth/ardour

3 files changed, 6 insertions, 105 deletions

diff --git a/libs/pbd/dmalloc.cc b/libs/pbd/dmalloc.cc
deleted file mode 100644
index 0e730946c8..0000000000
--- a/libs/pbd/dmalloc.cc
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * file that facilitates C++ program debugging.
- *
- * Copyright 1995 by Gray Watson
- *
- * This file is part of the dmalloc package.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * NON-COMMERCIAL purpose and without fee is hereby granted, provided
- * that the above copyright notice and this permission notice appear
- * in all copies, and that the name of Gray Watson not be used in
- * advertising or publicity pertaining to distribution of the document
- * or software without specific, written prior permission.
- *
- * Please see the PERMISSIONS file or contact the author for information
- * about commercial licenses.
- *
- * Gray Watson makes no representations about the suitability of the
- * software described herein for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * The author may be contacted via http://www.letters.com/~gray/
- *
- * $Id$
- */
-
-/*
- * This file is used to effectively redirect new to the more familiar
- * malloc and delete to the more familiar free so they can be debugged
- * with the debug malloc library..  They also give the known error
- * behavior, too.
- *
- * Compile and link this in with the C++ program you want to debug.
- *
- * NOTE: I am not a C++ hacker so feedback in the form of other hints
- * and ideas for C++ users would be much appreciated.
- */
-
-#ifdef DEBUG_MALLOC
-
-extern "C" {
-#include <stdlib.h>
-#include <dmalloc.h>
-#include "/usr/local/src/dmalloc-4.1.2/return.h"
-}
-
-/*
- * An overload function for the C++ new.
- */
-void *
-operator new(size_t size)
-{
-  char	*file;
-  GET_RET_ADDR(file);
-
-  /* handle correct C++ semantics for an alloc of size 0 */
-  
-  if (size == 0) size = 1;
-  
-  return _malloc_leap(file, 0, size);
-}
-
-/*
- * An overload function for the C++ new[].
- */
-void *
-operator new[](size_t size)
-{
-  char	*file;
-  GET_RET_ADDR(file);
-
-  /* handle correct C++ semantics for an alloc of size 0 */
-  
-  if (size == 0) size = 1;
-
-  return _malloc_leap(file, 0, size);
-}
-
-/*
- * An overload function for the C++ delete.
- */
-void
-operator delete(void *pnt)
-{
-  char	*file;
-  GET_RET_ADDR(file);
-  _free_leap(file, 0, pnt);
-}
-
-/*
- * An overload function for the C++ delete[].  Thanks to Jens Krinke
- * <j.krinke@gmx.de>
- */
-void
-operator delete[](void *pnt)
-{
-  char	*file;
-  GET_RET_ADDR(file);
-  _free_leap(file, 0, pnt);
-}
-
-#endif
diff --git a/libs/pbd/pbd/fastlog.h b/libs/pbd/pbd/fastlog.h
index 9897da773a..f64ad996cf 100644
--- a/libs/pbd/pbd/fastlog.h
+++ b/libs/pbd/pbd/fastlog.h
@@ -1,6 +1,10 @@
-/* Copyright unknown. Code by Laurent de Soras <laurent@ohmforce.com>.
- */
+/*
+Copyright © 2013 Laurent de Soras <laurent.de.soras@free.fr>
 
+This work is free. You can redistribute it and/or modify it under the
+terms of the Do What The Fuck You Want To Public License, Version 2,
+as published by Sam Hocevar. See http://www.wtfpl.net/ for more details.
+*/
 #ifndef __pbd_fastlog_h__
 #define __pbd_fastlog_h__
 
diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index 4d0c09f410..64dd2a332f 100644
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -43,7 +43,6 @@ libpbd_sources = [
     'debug.cc',
     'enumwriter.cc',
     'event_loop.cc',
-    'dmalloc.cc',
     'enums.cc',
     'epa.cc',
     'error.cc',