From 018b6d27e4529f24333b0a58a9dba3c208cbd6d3 Mon Sep 17 00:00:00 2001
From: sf-exg <sf-exg>
Date: Wed, 12 Nov 2014 12:12:02 +0000
Subject: Make new/delete compatible with C++11 and change new to use
 rxvt_malloc.

---
 src/rxvtutil.C | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 src/rxvtutil.C

(limited to 'src/rxvtutil.C')

diff --git a/src/rxvtutil.C b/src/rxvtutil.C
new file mode 100644
index 0000000..663085f
--- /dev/null
+++ b/src/rxvtutil.C
@@ -0,0 +1,67 @@
+/*----------------------------------------------------------------------*
+ * File:	rxvtutil.C
+ *----------------------------------------------------------------------*
+ *
+ * All portions of code are copyright by their respective author/s.
+ * Copyright (c) 2004-2006 Marc Lehmann <schmorp@schmorp.de>
+ *
+ * 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *----------------------------------------------------------------------*/
+
+// we include emman.c here to avoid relying on a C compiler, or
+// on the c++ compiler not complaining about .c, which is unlikely,
+// but...
+// This must be the first include, because the _GNU_SOURCE and
+// _XOPEN_SOURCE macros, used by emman.c, must be defined before
+// inclusion of any header.
+#include "emman.c"
+
+#include <stdlib.h>
+#include <string.h>
+#include <inttypes.h>
+
+#include "rxvtutil.h"
+
+void *
+zero_initialized::operator new (size_t s)
+{
+  void *p = malloc (s);
+
+  memset (p, 0, s);
+  return p;
+}
+
+void
+zero_initialized::operator delete (void *p, size_t s)
+{
+  free (p);
+}
+
+static void *temp_buf;
+static uint32_t temp_len;
+
+void *
+rxvt_temp_buf (int len)
+{
+  if (len > temp_len)
+    {
+      free (temp_buf);
+      temp_buf = malloc (len);
+      temp_len = len;
+    }
+
+  return temp_buf;
+}
+
-- 
cgit v1.2.3