diff options
| author | Malcolm Beattie <mbeattie@sable.ox.ac.uk> | 1997-10-16 11:09:25 +0000 |
|---|---|---|
| committer | Malcolm Beattie <mbeattie@sable.ox.ac.uk> | 1997-10-16 11:09:25 +0000 |
| commit | d58bf5aa3d3631a46847733b1ff1985b30140228 (patch) | |
| tree | 406c095d697ae0ae82bbf187e5c65151bd41232a /x2p | |
| parent | c7848ba184fac8eca4125f4296d6e09fee2c1846 (diff) | |
| parent | 50e27ac33704d6fb34d4be7cfb426b2097b27505 (diff) | |
| download | perl-d58bf5aa3d3631a46847733b1ff1985b30140228.tar.gz | |
Merge maint-5.004 branch (5.004_04) with mainline.
p4raw-id: //depot/perl@137
Diffstat (limited to 'x2p')
| -rwxr-xr-x | x2p/Makefile.SH | 2 | ||||
| -rw-r--r-- | x2p/util.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH index 0c9dfca841..dea2392ec4 100755 --- a/x2p/Makefile.SH +++ b/x2p/Makefile.SH @@ -132,7 +132,7 @@ lint: lint $(lintflags) $(defs) $(c) > a2p.fuzz depend: $(mallocsrc) ../makedepend - sh ../makedepend + sh ../makedepend MAKE=$(MAKE) clist: echo $(c) | tr ' ' '\012' >.clist diff --git a/x2p/util.c b/x2p/util.c index e8b666f393..469beb0c14 100644 --- a/x2p/util.c +++ b/x2p/util.c @@ -33,8 +33,8 @@ MEM_SIZE size; ptr = malloc(size ? size : 1); #ifdef DEBUGGING if (debug & 128) - fprintf(stderr,"0x%lx: (%05d) malloc %d bytes\n",(unsigned long)ptr, - an++,size); + fprintf(stderr,"0x%lx: (%05d) malloc %ld bytes\n",(unsigned long)ptr, + an++,(long)size); #endif if (ptr != Nullch) return ptr; @@ -59,7 +59,7 @@ MEM_SIZE size; #ifdef DEBUGGING if (debug & 128) { fprintf(stderr,"0x%lx: (%05d) rfree\n",(unsigned long)where,an++); - fprintf(stderr,"0x%lx: (%05d) realloc %d bytes\n",(unsigned long)ptr,an++,size); + fprintf(stderr,"0x%lx: (%05d) realloc %ld bytes\n",(unsigned long)ptr,an++,(long)size); } #endif if (ptr != Nullch) |