-----Original Message-----
From: xemacs-patches-bounces(a)xemacs.org
[mailto:xemacs-patches-bounces@xemacs.org] On Behalf Of Vin Shelton
Sent: Monday, January 24, 2005 7:11 PM
To: xemacs-patches(a)xemacs.org
Cc: Dr. Volker Zell
Subject: [AC21.4] sheap.c printf string patch for gcc-3.3.3 on Cygwin
Vin Shelton <acs(a)xemacs.org> writes:
> Without this fairly bogus patch, I cannot compile 21.4 on
Cygwin (at
> least using gcc-3.3.3).
>
> Comments? Recommendations?
>
> - Vin
>
>
> src/ChangeLog addition:
>
> 2005-01-24 Vin Shelton <acs(a)xemacs.org>
>
> * sheap.c (more_static_core): Reformatted printf string so
> gcc-3.3.3 will compile this on Cygwin.
>
>
> 21.4 source patch:
> Diff command: cvs -q diff -u
> Files affected: src/sheap.c
>
> Index: src/sheap.c
> ===================================================================
> RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sheap.c,v
> retrieving revision 1.12
> diff -a -u -u -r1.12 sheap.c
> --- src/sheap.c 2001/04/12 18:24:19 1.12
> +++ src/sheap.c 2005/01/24 20:58:38
> @@ -82,17 +82,8 @@
> {
> printf(
>
> -"\nRequested %d bytes, static heap exhausted! base is %p, current
> ptr -is %p. You have exhausted the static heap.
> -
> -If you are simply trying to compile, remove sheap-adjust.h -and
> recompile from the top level. If this doesn't -work then
> STATIC_HEAP_SLOP (defined in this file) is too small.
> -
> -If you want to run temacs, change SHEAP_ADJUSTMENT in
sheap-adjust.h
> -to 0 or a +ve number. Generally you should *not* try to run temacs
> -with a static heap, you should dump first.\n", size,
> -static_heap_base, static_heap_ptr);
> +"\nRequested %d bytes, static heap exhausted! base is %p, current
> +ptr\nis %p. You have exhausted the static heap.\n\nIf you
are simply
> +trying to compile, remove sheap-adjust.h\nand recompile
from the top
> +level. If this doesn't\nwork then STATIC_HEAP_SLOP
(defined in this
> +file) is too small.\n\nIf you want to run temacs, change
> +SHEAP_ADJUSTMENT in sheap-adjust.h\nto 0 or a +ve number.
Generally
> +you should *not* try to run temacs\nwith a static heap, you should
> +dump first.\n", size, static_heap_base, static_heap_ptr);
>
> exit(-1);
> return 0;
APPROVE COMMIT 21.4
I actually committed the James variation of the patch. Patch
will appear in XEmacs 21.4.17, "Jumbo Shrimp".
- Vin
Vin -- it would be better to commit the version that I sent, not the version
that you have currently. Using multiple "" strings is the ANSI-correct way
to do things.