Patch to get clean compile on SLES11 Linux

Patch to get clean compile on SLES11 Linux

[Fran]

I had to make this small change to the latest development sources to get a clean
compile on SLES11 Linux:

--- xmenu.c~	2010-07-15 14:31:37.000000000 -0400
+++ xmenu.c	2010-07-15 15:20:46.000020000 -0400
@@ -2275,7 +2275,7 @@
 
 
 Lisp_Object
-xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, Lisp_Object
title, char **error, unsigned int timestamp)
+xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, Lisp_Object
title, char **error, EMACS_UINT timestamp)
 {
   Window root;
   XMenu *menu;

I don't know if this affects other UNIX/Linux systems.
--
Fran

Re: Patch to get clean compile on SLES11 Linux

[Fran]

BTW, the compiler error was complaining about a type mismatch between the
declaration of xmenu_show() at src/menu.h:45:

  extern Lisp_Object xmenu_show (FRAME_PTR, int, int, int, int,
                                 Lisp_Object, char **, EMACS_UINT);

and the definition at src/xmenu.c:2278:

  Lisp_Object
  xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, Lisp_Object
title, char **error, unsigned int timestamp)

I don't know why EMACS_UINT was not the same as "unsigned int" on my system.
--
Fran

Re: Patch to get clean compile on SLES11 Linux

[Jan Djärv]

EMACS_INT is long and EMACS_UINT is unsigned long.  On a 64 bit compiler int 
is usually 32 bits and long 64.

	Jan D.


Fran skrev 2010-07-15 21.38:
> BTW, the compiler error was complaining about a type mismatch between the
> declaration of xmenu_show() at src/menu.h:45:
>
>    extern Lisp_Object xmenu_show (FRAME_PTR, int, int, int, int,
>                                   Lisp_Object, char **, EMACS_UINT);
>
> and the definition at src/xmenu.c:2278:
>
>    Lisp_Object
>    xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, Lisp_Object
> title, char **error, unsigned int timestamp)
>
> I don't know why EMACS_UINT was not the same as "unsigned int" on my system.
> --
> Fran
>
>

Re: Patch to get clean compile on SLES11 Linux

[Fran Litterio]

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

On Thu, Jul 15, 2010 at 5:27 PM, Jan Djärv wrote:

EMACS_INT is long and EMACS_UINT is unsigned long.  On a 64 bit compiler int
> is usually 32 bits and long 64.
>

Indeed, this was being compiled on a 64-bit machine.

I think my patch is a valid fix for this.
--
Fran

[-- Attachment #2: Type: text/html, Size: 509 bytes --]