compilation failure on GNU/Linux: CVS HEAD

compilation failure on GNU/Linux: CVS HEAD

[dhruva]

Hello,
For some reason, my build of CVS Emacs fails on GNU/Linux. Following
are the OS/HW details.

$uname -srvmpio
Linux 2.6.9-42.ELsmp #1 SMP Wed Jul 12 23:27:17 EDT 2006 i686 i686
i386 GNU/Linux
$ gcc --version
2.95.1g

The following trivial patch fixes the issue!

bash-3.00$ cvs diff
cvs diff: Diffing .
Index: fontset.c
===================================================================
RCS file: /sources/emacs/emacs/src/fontset.c,v
retrieving revision 1.115
diff -p -u -w -B -r1.115 fontset.c
--- fontset.c   26 Feb 2008 18:18:04 -0000      1.115
+++ fontset.c   10 Mar 2008 05:15:56 -0000
@@ -2245,7 +2245,7 @@ fontset.  The format is the same as abob
                              {
                                struct font *font
                                  = XSAVE_VALUE (font_object)->pointer;
-                               char *name = font->font.full_name;;
+                               char *name = font->font.full_name;
                                int len = strlen (name);
                                Lisp_Object slot;

Index: sound.c
===================================================================
RCS file: /sources/emacs/emacs/src/sound.c,v
retrieving revision 1.47
diff -p -u -w -B -r1.47 sound.c
--- sound.c     8 Jan 2008 20:44:27 -0000       1.47
+++ sound.c     10 Mar 2008 05:16:02 -0000
@@ -1105,9 +1105,9 @@ alsa_configure (sd)
               {
                 if (snd_mixer_selem_has_playback_volume (e))
                   {
-                    long pmin, pmax;
+                    long pmin, pmax, vol;
                     snd_mixer_selem_get_playback_volume_range (e,
&pmin, &pmax);
-                    long vol = pmin + (sd->volume * (pmax - pmin)) / 100;
+                    vol = pmin + (sd->volume * (pmax - pmin)) / 100;

                     for (chn = 0; chn <= SND_MIXER_SCHN_LAST; chn++)
                       snd_mixer_selem_set_playback_volume (e, chn, vol);

-- 
Contents reflect my personal views only!

Re: compilation failure on GNU/Linux: CVS HEAD

[Jan Djärv]

dhruva skrev:
> Hello,
> For some reason, my build of CVS Emacs fails on GNU/Linux. Following
> are the OS/HW details.
> 
> $uname -srvmpio
> Linux 2.6.9-42.ELsmp #1 SMP Wed Jul 12 23:27:17 EDT 2006 i686 i686
> i386 GNU/Linux
> $ gcc --version
> 2.95.1g
> 
> The following trivial patch fixes the issue!

Applied, thanks.

	Jan D.

> 
> bash-3.00$ cvs diff
> cvs diff: Diffing .
> Index: fontset.c
> ===================================================================
> RCS file: /sources/emacs/emacs/src/fontset.c,v
> retrieving revision 1.115
> diff -p -u -w -B -r1.115 fontset.c
> --- fontset.c   26 Feb 2008 18:18:04 -0000      1.115
> +++ fontset.c   10 Mar 2008 05:15:56 -0000
> @@ -2245,7 +2245,7 @@ fontset.  The format is the same as abob
>                               {
>                                 struct font *font
>                                   = XSAVE_VALUE (font_object)->pointer;
> -                               char *name = font->font.full_name;;
> +                               char *name = font->font.full_name;
>                                 int len = strlen (name);
>                                 Lisp_Object slot;
> 
> Index: sound.c
> ===================================================================
> RCS file: /sources/emacs/emacs/src/sound.c,v
> retrieving revision 1.47
> diff -p -u -w -B -r1.47 sound.c
> --- sound.c     8 Jan 2008 20:44:27 -0000       1.47
> +++ sound.c     10 Mar 2008 05:16:02 -0000
> @@ -1105,9 +1105,9 @@ alsa_configure (sd)
>                {
>                  if (snd_mixer_selem_has_playback_volume (e))
>                    {
> -                    long pmin, pmax;
> +                    long pmin, pmax, vol;
>                      snd_mixer_selem_get_playback_volume_range (e,
> &pmin, &pmax);
> -                    long vol = pmin + (sd->volume * (pmax - pmin)) / 100;
> +                    vol = pmin + (sd->volume * (pmax - pmin)) / 100;
> 
>                      for (chn = 0; chn <= SND_MIXER_SCHN_LAST; chn++)
>                        snd_mixer_selem_set_playback_volume (e, chn, vol);
>