57 lines
1.6 KiB
Diff
57 lines
1.6 KiB
Diff
diff -up xpdf-3.04/goo/gmem.cc.alloc xpdf-3.04/goo/gmem.cc
|
|
--- xpdf-3.04/goo/gmem.cc.alloc 2014-05-28 14:50:50.000000000 -0400
|
|
+++ xpdf-3.04/goo/gmem.cc 2014-05-29 15:00:18.670819951 -0400
|
|
@@ -48,9 +48,9 @@ static int gMaxMemInUse = 0;
|
|
|
|
#endif /* DEBUG_MEM */
|
|
|
|
-void *gmalloc(int size) GMEM_EXCEP {
|
|
+void *gmalloc(size_t size) GMEM_EXCEP {
|
|
#ifdef DEBUG_MEM
|
|
- int size1;
|
|
+ size_t size1;
|
|
char *mem;
|
|
GMemHdr *hdr;
|
|
void *data;
|
|
@@ -106,11 +106,11 @@ void *gmalloc(int size) GMEM_EXCEP {
|
|
#endif
|
|
}
|
|
|
|
-void *grealloc(void *p, int size) GMEM_EXCEP {
|
|
+void *grealloc(void *p, size_t size) GMEM_EXCEP {
|
|
#ifdef DEBUG_MEM
|
|
GMemHdr *hdr;
|
|
void *q;
|
|
- int oldSize;
|
|
+ size_t oldSize;
|
|
|
|
if (size < 0) {
|
|
gMemError("Invalid memory allocation size");
|
|
@@ -186,7 +186,7 @@ void *greallocn(void *p, int nObjs, int
|
|
|
|
void gfree(void *p) {
|
|
#ifdef DEBUG_MEM
|
|
- int size;
|
|
+ size_t size;
|
|
GMemHdr *hdr;
|
|
unsigned long *trl, *clr;
|
|
|
|
diff -up xpdf-3.04/goo/gmem.h.alloc xpdf-3.04/goo/gmem.h
|
|
--- xpdf-3.04/goo/gmem.h.alloc 2014-05-28 14:50:50.000000000 -0400
|
|
+++ xpdf-3.04/goo/gmem.h 2014-05-29 14:59:04.364344108 -0400
|
|
@@ -36,13 +36,13 @@ extern "C" {
|
|
* Same as malloc, but prints error message and exits if malloc()
|
|
* returns NULL.
|
|
*/
|
|
-extern void *gmalloc(int size) GMEM_EXCEP;
|
|
+extern void *gmalloc(size_t size) GMEM_EXCEP;
|
|
|
|
/*
|
|
* 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) GMEM_EXCEP;
|
|
+extern void *grealloc(void *p, size_t size) GMEM_EXCEP;
|
|
|
|
/*
|
|
* These are similar to gmalloc and grealloc, but take an object count
|