bug#7309: [patch] make emacs compile with clang

bug#7309: [patch] make emacs compile with clang

[Elias Pipping]

[-- Attachment #1: Type: text/plain, Size: 294 bytes --]

Hi,

(given the combination of configure options that I use), emacs fails
to compile for me because of a single issue that is easily fixed: two
functions in oldXMenu don't specify a return type. Apparently, it
should be void in both cases. I've attached a patch.


Kind regards,

Elias Pipping

[-- Attachment #2: emacs-23.2-clang.patch --]
[-- Type: text/x-patch, Size: 736 bytes --]

Source: Elias Pipping <pipping@exherbo.org>
Upstream: no
Reason: The return type should be void, not int
--- emacs-23.2/oldXMenu/XDelAssoc.c
+++ emacs-23.2/oldXMenu/XDelAssoc.c
@@ -17,6 +17,7 @@
  * an XId.  An association may be removed only once.  Redundant
  * deletes are meaningless (but cause no problems).
  */
+void
 XDeleteAssoc(dpy, table, x_id)
         register Display *dpy;
 	register XAssocTable *table;
--- emacs-23.2/oldXMenu/XMakeAssoc.c
+++ emacs-23.2/oldXMenu/XMakeAssoc.c
@@ -27,6 +27,7 @@
  * meaningless (but cause no problems).  The queue in each association
  * bucket is sorted (lowest XId to highest XId).
  */
+void
 XMakeAssoc(dpy, table, x_id, data)
 	register Display *dpy;
 	register XAssocTable *table;

bug#7309: [patch] make emacs compile with clang

[Stefan Monnier]

> (given the combination of configure options that I use), emacs fails
> to compile for me because of a single issue that is easily fixed: two
> functions in oldXMenu don't specify a return type. Apparently, it
> should be void in both cases. I've attached a patch.

Thanks, installed in the emacs-23 branch.


        Stefan