[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvtutil.C

Comparing rxvt-unicode/src/rxvtutil.C (file contents):
Revision 1.19 by root, Thu May 22 18:54:33 2014 UTC vs.
Revision 1.21 by sf-exg, Tue Oct 28 09:05:33 2014 UTC

  * 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"
 zero_initialized::operator delete (void *p, size_t s)
 {
   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;
 void *
 rxvt_temp_buf (int len)
     }
   return temp_buf;
 }
-// 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...
-#include "emman.c"

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines