Magellan Linux

Annotation of /trunk/xpdf/patches/xpdf-3.00-64bit.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 153 - (hide annotations) (download)
Tue May 8 20:52:56 2007 UTC (17 years, 1 month ago) by niro
File size: 1304 byte(s)
-import

1 niro 153 --- xpdf-3.00/goo/gmem.h.me 2005-07-25 10:47:46.000000000 +0200
2     +++ xpdf-3.00/goo/gmem.h 2005-07-25 10:49:55.000000000 +0200
3     @@ -19,13 +19,13 @@
4     * Same as malloc, but prints error message and exits if malloc()
5     * returns NULL.
6     */
7     -extern void *gmalloc(int size);
8     +extern void *gmalloc(size_t size);
9    
10     /*
11     * Same as realloc, but prints error message and exits if realloc()
12     * returns NULL. If <p> is NULL, calls malloc instead of realloc().
13     */
14     -extern void *grealloc(void *p, int size);
15     +extern void *grealloc(void *p, size_t size);
16    
17     /*
18     * Same as free, but checks for and ignores NULL pointers.
19     --- xpdf-3.00/goo/gmem.c.me 2005-07-25 10:47:51.000000000 +0200
20     +++ xpdf-3.00/goo/gmem.c 2005-07-25 10:49:30.000000000 +0200
21     @@ -53,9 +53,9 @@
22    
23     #endif /* DEBUG_MEM */
24    
25     -void *gmalloc(int size) {
26     +void *gmalloc(size_t size) {
27     #ifdef DEBUG_MEM
28     - int size1;
29     + size_t size1;
30     char *mem;
31     GMemHdr *hdr;
32     void *data;
33     @@ -94,11 +94,11 @@
34     #endif
35     }
36    
37     -void *grealloc(void *p, int size) {
38     +void *grealloc(void *p, size_t size) {
39     #ifdef DEBUG_MEM
40     GMemHdr *hdr;
41     void *q;
42     - int oldSize;
43     + size_t oldSize;
44    
45     if (size == 0) {
46     if (p)
47     @@ -137,7 +137,7 @@
48    
49     void gfree(void *p) {
50     #ifdef DEBUG_MEM
51     - int size;
52     + size_t size;
53     GMemHdr *hdr;
54     GMemHdr *prevHdr, *q;
55     int lst;