56 lines
1.3 KiB
Diff
56 lines
1.3 KiB
Diff
|
--- xpdf-3.00/goo/gmem.h.can-2005-0206 2004-01-21 18:26:44.000000000 -0700
|
||
|
|
+++ xpdf-3.00/goo/gmem.h 2005-02-15 06:55:02.201587908 -0700
|
||
|
|
@@ -19,13 +19,13 @@
|
||
|
|
* Same as malloc, but prints error message and exits if malloc()
|
||
|
|
* returns NULL.
|
||
|
|
*/
|
||
|
|
-extern void *gmalloc(int size);
|
||
|
|
+extern void *gmalloc(size_t size);
|
||
|
|
|
||
|
|
/*
|
||
|
|
* Same as realloc, but prints error message and exits if realloc()
|
||
|
|
* returns NULL. If <p> is NULL, calls malloc instead of realloc().
|
||
|
|
*/
|
||
|
|
-extern void *grealloc(void *p, int size);
|
||
|
|
+extern void *grealloc(void *p, size_t size);
|
||
|
|
|
||
|
|
/*
|
||
|
|
* Same as free, but checks for and ignores NULL pointers.
|
||
|
|
--- xpdf-3.00/goo/gmem.c.can-2005-0206 2004-01-21 18:26:44.000000000 -0700
|
||
|
|
+++ xpdf-3.00/goo/gmem.c 2005-02-15 06:55:02.202587704 -0700
|
||
|
|
@@ -53,9 +53,9 @@
|
||
|
|
|
||
|
|
#endif /* DEBUG_MEM */
|
||
|
|
|
||
|
|
-void *gmalloc(int size) {
|
||
|
|
+void *gmalloc(size_t size) {
|
||
|
|
#ifdef DEBUG_MEM
|
||
|
|
- int size1;
|
||
|
|
+ size_t size1;
|
||
|
|
char *mem;
|
||
|
|
GMemHdr *hdr;
|
||
|
|
void *data;
|
||
|
|
@@ -94,11 +94,11 @@
|
||
|
|
#endif
|
||
|
|
}
|
||
|
|
|
||
|
|
-void *grealloc(void *p, int size) {
|
||
|
|
+void *grealloc(void *p, size_t size) {
|
||
|
|
#ifdef DEBUG_MEM
|
||
|
|
GMemHdr *hdr;
|
||
|
|
void *q;
|
||
|
|
- int oldSize;
|
||
|
|
+ size_t oldSize;
|
||
|
|
|
||
|
|
if (size == 0) {
|
||
|
|
if (p)
|
||
|
|
@@ -137,7 +137,7 @@
|
||
|
|
|
||
|
|
void gfree(void *p) {
|
||
|
|
#ifdef DEBUG_MEM
|
||
|
|
- int size;
|
||
|
|
+ size_t size;
|
||
|
|
GMemHdr *hdr;
|
||
|
|
GMemHdr *prevHdr, *q;
|
||
|
|
int lst;
|