--- rxvt-unicode/src/rxvtutil.C	2006/01/25 00:42:21	1.3
+++ rxvt-unicode/src/rxvtutil.C	2014/10/28 09:05:33	1.21
@@ -1,28 +1,39 @@
-#include <cstdlib>
-#include <cstring>
+/*----------------------------------------------------------------------*
+ * 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"
 
-class byteorder byteorder;
-
-unsigned int byteorder::e;
-
-byteorder::byteorder ()
-{
-  union {
-    uint32_t u;
-    uint8_t b[4];
-  } w;
-
-  w.b[0] = 0x11;
-  w.b[1] = 0x22;
-  w.b[2] = 0x33;
-  w.b[3] = 0x44;
-
-  e = w.u;
-}
-
 void *
 zero_initialized::operator new (size_t s)
 {
@@ -38,6 +49,19 @@
   free (p);
 }
 
+void *
+operator new (size_t s) throw (std::bad_alloc)
+{
+  // TODO: use rxvt_malloc
+  return malloc (s);
+}
+
+void
+operator delete (void *p) throw ()
+{
+  free (p);
+}
+
 static void *temp_buf;
 static uint32_t temp_len;
 
@@ -45,13 +69,12 @@
 rxvt_temp_buf (int len)
 {
   if (len > temp_len)
-    { 
+    {
       free (temp_buf);
       temp_buf = malloc (len);
       temp_len = len;
     }
-  
+
   return temp_buf;
 }
 
-