Re: Emacs build failure on M$ (MSVC)

[Óscar Fuentes]

dhruva <address@hidden> writes:

> Hi,
>  The recent HEAD fails to build:
>
>         cl -I. -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0400  -nologo
> -D_X86_=1 -c -Zel -W2 -H63 -Oxsb2 -Oy- -G6dF -Zp8 -Zi -Di386
> -D_CRTAPI1=_cdecl   /Ic:/tools/msvcimage/include -Demacs=1 -DWINDOWSNT
> -DDOS_NT -DHAVE_CONFIG_H -I../nt/inc -D_UCHAR_T -DHAVE_NTGUI=1
> -Foobj-spd/i386\ w32menu.c
> w32menu.c
> w32menu.c(219) : error C2011: 'menu_item_idx' : 'enum' type redefinition
>         c:\users\dhruva\stub\repo\git\emacs\src\keyboard.h(298) : see
> declaration of 'menu_item_idx'
> NMAKE : fatal error U1077: 'cl' : return code '0x2'
> Stop.
> NMAKE : fatal error U1077: '"C:\Program Files\Microsoft Visual Studio
> .NET 2003\VC7\BIN\nmake.exe"' : return code '0x2'
> Stop.

Seems that an equivalent of part of this change must be performed on the
Windows specific code:

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/06/08 04:38:12

Modified files:
        src            : ChangeLog 

Log message:
        * Makefile.in: Compile menu.c.
        
        * lisp.h: Declare syms_of_menu.
        
        * emacs.c (main): Call syms_of_menu.
        
        * keyboard.h: Relocate platform-independent menu definitions from
        xmenu.c.
        
        * menu.c: New file.  Relocate platform-independent menu
        definitions from xmenu.c.
        
        * xmenu.c: Remove platform-independent menu definitions.
        (menu_items menu_items_inuse, menu_items_allocated)
        (menu_items_used, menu_items_n_panes)
        (menu_items_submenu_depth): Move to keyboard.h.
        (init_menu_items, finish_menu_items, unuse_menu_items)
        (discard_menu_items, restore_menu_items, save_menu_items)
        (grow_menu_items, push_submenu_start, push_submenu_end)
        (push_left_right_boundary, push_menu_pane, push_menu_item)
        (keymap_panes, single_keymap_panes, single_menu_item)
        (list_of_panes, list_of_items, find_and_call_menu_selection)
        (xmalloc_widget_value, free_menubar_widget_value_tree)
        (parse_single_submenu, digest_single_submenu)
        (update_submenu_strings): Move to menu.c.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.6519&r2=1.6520

-- 
Oscar