ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtutil.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtutil.C (file contents):
Revision 1.15 by sf-exg, Thu Jun 2 13:07:28 2011 UTC vs.
Revision 1.21 by sf-exg, Tue Oct 28 09:05:33 2014 UTC

5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2004-2006 Marc Lehmann <schmorp@schmorp.de> 6 * Copyright (c) 2004-2006 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 *----------------------------------------------------------------------*/ 21 *----------------------------------------------------------------------*/
22 22
23// we include emman.c here to avoid relying on a C compiler, or
24// on the c++ compiler not complaining about .c, which is unlikely,
25// but...
26// This must be the first include, because the _GNU_SOURCE and
27// _XOPEN_SOURCE macros, used by emman.c, must be defined before
28// inclusion of any header.
29#include "emman.c"
30
23#include <cstdlib> 31#include <stdlib.h>
24#include <cstring> 32#include <string.h>
33#include <inttypes.h>
25 34
26#include "rxvtutil.h" 35#include "rxvtutil.h"
27 36
28void * 37void *
29zero_initialized::operator new (size_t s) 38zero_initialized::operator new (size_t s)
34 return p; 43 return p;
35} 44}
36 45
37void 46void
38zero_initialized::operator delete (void *p, size_t s) 47zero_initialized::operator delete (void *p, size_t s)
48{
49 free (p);
50}
51
52void *
53operator new (size_t s) throw (std::bad_alloc)
54{
55 // TODO: use rxvt_malloc
56 return malloc (s);
57}
58
59void
60operator delete (void *p) throw ()
39{ 61{
40 free (p); 62 free (p);
41} 63}
42 64
43static void *temp_buf; 65static void *temp_buf;
54 } 76 }
55 77
56 return temp_buf; 78 return temp_buf;
57} 79}
58 80
59

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines