From 241e064849a945324588bb773ee06b0e0b7006e7 Mon Sep 17 00:00:00 2001 From: beck <> Date: Tue, 25 Mar 2014 17:00:02 +0000 Subject: [PATCH] Poul-Henning Kamp informed me he is allright with this licensing change. --- src/lib/libc/stdlib/malloc.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c index 545e51e2..214b1bb9 100644 --- a/src/lib/libc/stdlib/malloc.c +++ b/src/lib/libc/stdlib/malloc.c @@ -1,6 +1,7 @@ -/* $OpenBSD: malloc.c,v 1.150 2013/11/12 06:57:54 deraadt Exp $ */ +/* $OpenBSD: malloc.c,v 1.151 2014/03/25 17:00:02 beck Exp $ */ /* * Copyright (c) 2008 Otto Moerbeek + * Copyright (c) 2000 Poul-Henning Kamp * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -16,16 +17,8 @@ */ /* - * Parts of this code, mainly the sub page sized chunk management code is - * derived from the malloc implementation with the following license: - */ -/* - * ---------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * wrote this file. As long as you retain this notice you - * can do whatever you want with this stuff. If we meet some day, and you think - * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp - * ---------------------------------------------------------------------------- + * If we meet some day, and you think this stuff is worth it, you + * can buy me a beer in return. Poul-Henning Kamp */ /* #define MALLOC_STATS */