Trunk build is broken again.

Trunk build is broken again.

[Eric S. Raymond]

At 0125 EST May 15, "make mainainter-clean; configure; nake bootstrap" gives:

_BSD_SOURCE -I/usr/include/freetype2 -I/usr/include/alsa  -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -g -O2 -Wno-pointer-sign  xterm.c
In file included from xterm.c:77:
emacs-icon.h:23: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘:’ token
xterm.c: In function ‘x_bitmap_icon’:
xterm.c:7492: error: ‘gnu_xpm_bits’ undeclared (first use in this function)
xterm.c:7492: error: (Each undeclared identifier is reported only once
xterm.c:7492: error: for each function it appears in.)
-- 
		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>

The people of the various provinces are strictly forbidden to have in their
possession any swords, short swords, bows, spears, firearms, or other types
of arms. The possession of unnecessary implements makes difficult the
collection of taxes and dues and tends to foment uprisings.
        -- Toyotomi Hideyoshi, dictator of Japan, August 1588

Re: Trunk build is broken again.

[Sven Joachim]

On 2008-05-15 07:26 +0200, Eric S. Raymond wrote:

> At 0125 EST May 15, "make mainainter-clean; configure; nake bootstrap" gives:
>
> _BSD_SOURCE -I/usr/include/freetype2 -I/usr/include/alsa  -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -g -O2 -Wno-pointer-sign  xterm.c
> In file included from xterm.c:77:
> emacs-icon.h:23: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘:’ token
> xterm.c: In function ‘x_bitmap_icon’:
> xterm.c:7492: error: ‘gnu_xpm_bits’ undeclared (first use in this function)
> xterm.c:7492: error: (Each undeclared identifier is reported only once
> xterm.c:7492: error: for each function it appears in.)

The following change fixes that:

2008-05-15  Sven Joachim  <svenjoac@gmx.de>

	* emacs-icon.h: Fix latest change.


--8<---------------cut here---------------start------------->8---
--- emacs-icon.h.~1.2.~	2008-05-15 07:39:13.000000000 +0200
+++ emacs-icon.h	2008-05-15 07:59:27.000000000 +0200
@@ -18,7 +18,7 @@
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 Commentary:
 
--8<---------------cut here---------------end--------------->8---

I wish that people would try to build before checking in mass changes.

Sven