--- rxvt-unicode/src/rxvtutil.C	2011/02/21 07:41:03	1.13
+++ rxvt-unicode/src/rxvtutil.C	2014/10/28 09:05:33	1.21
@@ -7,7 +7,7 @@
  *
  * 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
+ * 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,
@@ -20,50 +20,44 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *----------------------------------------------------------------------*/
 
-#include <cstdlib>
-#include <cstring>
+// 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"
 
-#if !HAVE_GCC_BUILTINS
-int rxvt_ctz (unsigned int x) CONST
+void *
+zero_initialized::operator new (size_t s)
 {
-  int r = 0;
-
-  x &= -x; // this isolates the lowest bit
-
-  if (x & 0xaaaaaaaa) r +=  1;
-  if (x & 0xcccccccc) r +=  2;
-  if (x & 0xf0f0f0f0) r +=  4;
-  if (x & 0xff00ff00) r +=  8;
-  if (x & 0xffff0000) r += 16;
+  void *p = malloc (s);
 
-  return r;
+  memset (p, 0, s);
+  return p;
 }
 
-int rxvt_popcount (unsigned int x) CONST
+void
+zero_initialized::operator delete (void *p, size_t s)
 {
-  x -=  (x >> 1) & 0x55555555;
-  x  = ((x >> 2) & 0x33333333) + (x & 0x33333333);
-  x  = ((x >> 4) + x) & 0x0f0f0f0f;
-  x *= 0x01010101;
-
-  return x >> 24;
+  free (p);
 }
-#endif
 
 void *
-zero_initialized::operator new (size_t s)
+operator new (size_t s) throw (std::bad_alloc)
 {
-  void *p = malloc (s);
-
-  memset (p, 0, s);
-  return p;
+  // TODO: use rxvt_malloc
+  return malloc (s);
 }
 
 void
-zero_initialized::operator delete (void *p, size_t s)
+operator delete (void *p) throw ()
 {
   free (p);
 }
@@ -84,4 +78,3 @@
   return temp_buf;
 }
 
-