make fails in w32menu.c

make fails in w32menu.c

[martin rudalics]

make fails here with current trunk as below.

martin



c:\Programme\Emacs-trunk\nt>make
Using C:\WINDOWS\system32\cmd.exe as shell.
.
.
make   -C ../lib-src all
make[1]: Entering directory `c:/Programme/Emacs-trunk/lib-src'
make[1]: Nothing to be done for `all'.
make[1]: Leaving directory `c:/Programme/Emacs-trunk/lib-src'
make   -C ../src all
make[1]: Entering directory `c:/Programme/Emacs-trunk/src'
gcc -o oo-spd/i386/temacs.bin  -gdwarf-2 -g3    -Wl,-stack,0x00800000 -Wl,-heap,
0x00100000 -Wl,-image-base,0x01000000 -Wl,-subsystem,console -Wl,-entry,__start
-Wl,-Map,oo-spd/i386/temacs.map oo-spd/i386/firstfile.o oo-spd/i386/emacs.res oo
-spd/i386/temacs0.a oo-spd/i386/temacs1.a oo-spd/i386/temacw32.a oo-spd/i386/las
tfile.a -lwinmm -ladvapi32 -lgdi32 -lcomdlg32 -luser32 -lmpr -lshell32 -lwinspoo
l -lole32 -lcomctl32 -lusp10
oo-spd/i386/temacw32.a(w32menu.o): In function `set_frame_menubar':
c:\Programme\Emacs-trunk\src/w32menu.c:706: undefined reference to `save_menu_it
ems'
c:\Programme\Emacs-trunk\src/w32menu.c:708: undefined reference to `menu_items'
c:\Programme\Emacs-trunk\src/w32menu.c:709: undefined reference to `menu_items_a
llocated'
c:\Programme\Emacs-trunk\src/w32menu.c:715: undefined reference to `init_menu_it
ems'
c:\Programme\Emacs-trunk\src/w32menu.c:728: undefined reference to `menu_items_u
sed'
c:\Programme\Emacs-trunk\src/w32menu.c:730: undefined reference to `menu_items_n
_panes'
c:\Programme\Emacs-trunk\src/w32menu.c:731: undefined reference to `parse_single
_submenu'
c:\Programme\Emacs-trunk\src/w32menu.c:733: undefined reference to `menu_items_n
_panes'
c:\Programme\Emacs-trunk\src/w32menu.c:735: undefined reference to `menu_items_u
sed'
c:\Programme\Emacs-trunk\src/w32menu.c:738: undefined reference to `finish_menu_
items'
c:\Programme\Emacs-trunk\src/w32menu.c:743: undefined reference to `xmalloc_widg
et_value'
c:\Programme\Emacs-trunk\src/w32menu.c:753: undefined reference to `menu_items_n
_panes'
c:\Programme\Emacs-trunk\src/w32menu.c:754: undefined reference to `digest_singl
e_submenu'
c:\Programme\Emacs-trunk\src/w32menu.c:771: undefined reference to `menu_items'
c:\Programme\Emacs-trunk\src/w32menu.c:771: undefined reference to `menu_items_u
sed'
c:\Programme\Emacs-trunk\src/w32menu.c:783: undefined reference to `menu_items'
c:\Programme\Emacs-trunk\src/w32menu.c:784: undefined reference to `menu_items_u
sed'
c:\Programme\Emacs-trunk\src/w32menu.c:802: undefined reference to `update_subme
nu_strings'
c:\Programme\Emacs-trunk\src/w32menu.c:869: undefined reference to `free_menubar
_widget_value_tree'
c:\Programme\Emacs-trunk\src/w32menu.c:811: undefined reference to `xmalloc_widg
et_value'
c:\Programme\Emacs-trunk\src/w32menu.c:828: undefined reference to `xmalloc_widg
et_value'
c:\Programme\Emacs-trunk\src/w32menu.c:885: undefined reference to `menu_items_u
sed'
c:\Programme\Emacs-trunk\src/w32menu.c:777: undefined reference to `free_menubar
_widget_value_tree'
c:\Programme\Emacs-trunk\src/w32menu.c:778: undefined reference to `discard_menu
_items'
oo-spd/i386/temacw32.a(w32menu.o): In function `w32_menu_show':
c:\Programme\Emacs-trunk\src/w32menu.c:954: undefined reference to `menu_items_u
sed'
c:\Programme\Emacs-trunk\src/w32menu.c:962: undefined reference to `menu_items_n
_panes'
c:\Programme\Emacs-trunk\src/w32menu.c:973: undefined reference to `xmalloc_widg
et_value'
c:\Programme\Emacs-trunk\src/w32menu.c:1122: undefined reference to `menu_items_
used'
c:\Programme\Emacs-trunk\src/w32menu.c:986: undefined reference to `menu_items'
c:\Programme\Emacs-trunk\src/w32menu.c:1090: undefined reference to `xmalloc_wid
get_value'
c:\Programme\Emacs-trunk\src/w32menu.c:1118: undefined reference to `menu_items_
used'
c:\Programme\Emacs-trunk\src/w32menu.c:1129: undefined reference to `xmalloc_wid
get_value'
c:\Programme\Emacs-trunk\src/w32menu.c:1130: undefined reference to `xmalloc_wid
get_value'
c:\Programme\Emacs-trunk\src/w32menu.c:1175: undefined reference to `free_menuba
r_widget_value_tree'
c:\Programme\Emacs-trunk\src/w32menu.c:1231: undefined reference to `menu_items_
used'
c:\Programme\Emacs-trunk\src/w32menu.c:1193: undefined reference to `menu_items'

c:\Programme\Emacs-trunk\src/w32menu.c:1195: undefined reference to `menu_items_
used'
c:\Programme\Emacs-trunk\src/w32menu.c:1030: undefined reference to `menu_items_
n_panes'
c:\Programme\Emacs-trunk\src/w32menu.c:1055: undefined reference to `menu_items_
used'
c:\Programme\Emacs-trunk\src/w32menu.c:1087: undefined reference to `menu_items'

c:\Programme\Emacs-trunk\src/w32menu.c:1079: undefined reference to `menu_items'

c:\Programme\Emacs-trunk\src/w32menu.c:1038: undefined reference to `xmalloc_wid
get_value'
c:\Programme\Emacs-trunk\src/w32menu.c:1021: undefined reference to `menu_items'

oo-spd/i386/temacw32.a(w32menu.o): In function `Fx_popup_menu':
c:\Programme\Emacs-trunk\src/w32menu.c:269: undefined reference to `unuse_menu_i
tems'
c:\Programme\Emacs-trunk\src/w32menu.c:335: undefined reference to `list_of_pane
s'
c:\Programme\Emacs-trunk\src/w32menu.c:358: undefined reference to `discard_menu
_items'
c:\Programme\Emacs-trunk\src/w32menu.c:371: undefined reference to `discard_menu
_items'
c:\Programme\Emacs-trunk\src/w32menu.c:321: undefined reference to `keymap_panes
'
c:\Programme\Emacs-trunk\src/w32menu.c:324: undefined reference to `menu_items_n
_panes'
c:\Programme\Emacs-trunk\src/w32menu.c:325: undefined reference to `menu_items'
c:\Programme\Emacs-trunk\src/w32menu.c:283: undefined reference to `keymap_panes
'
c:\Programme\Emacs-trunk\src/w32menu.c:292: undefined reference to `menu_items_n
_panes'
c:\Programme\Emacs-trunk\src/w32menu.c:293: undefined reference to `menu_items'
collect2: ld returned 1 exit status
make[1]: *** [oo-spd/i386/temacs.exe] Error 1
make[1]: Leaving directory `c:/Programme/Emacs-trunk/src'
make: *** [all-other-dirs-gmake] Error 2

Re: make fails in w32menu.c

[Juanma Barranquero]

On Mon, Sep 22, 2008 at 13:59, martin rudalics <rudalics@gmx.at> wrote:
> make fails here with current trunk as below.
>
> martin

Try the following patch.

   Juanma


diff --git a/src/emacs.c b/src/emacs.c
index 131662c..af4a692 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1071,9 +1071,9 @@ main (int argc, char **argv)
       exit (0);
     }

-#ifndef DOS_NT
   if (argmatch (argv, argc, "-daemon", "--daemon", 5, NULL, &skip_args))
     {
+#ifndef DOS_NT
       pid_t f = fork();
       int nfd;
       if (f > 0)
@@ -1093,11 +1093,11 @@ main (int argc, char **argv)
 #ifdef HAVE_SETSID
       setsid();
 #endif
-    }
 #else /* DOS_NT */
-  fprintf (stderr, "This platform does not support the -daemon flag.\n");
-  exit (1);
+      fprintf (stderr, "This platform does not support the -daemon flag.\n");
+      exit (1);
 #endif /* DOS_NT */
+    }

   if (! noninteractive)
     {

Re: make fails in w32menu.c

[martin rudalics]

> Try the following patch.

Builds and works normally here.

Thanks, martin

Re: make fails in w32menu.c

[Juanma Barranquero]

On Mon, Sep 22, 2008 at 17:12, martin rudalics <rudalics@gmx.at> wrote:

> Builds and works normally here.

Dan has committed the same trivial fix already.

  Juanma

Re: make fails in w32menu.c

[martin rudalics]

> Dan has committed the same trivial fix already.

Works as well.  The fixes seem to differ slightly, though.

martin

Re: make fails in w32menu.c

[Juanma Barranquero]

> Works as well.  The fixes seem to differ slightly, though.

AFAICS, the only difference is whitespace. emacs-diffs commits do not
show whitespace changes, while my patch was done with git.

   Juanma

Re: make fails in w32menu.c

[martin rudalics]

> AFAICS, the only difference is whitespace. emacs-diffs commits do not
> show whitespace changes, while my patch was done with git.

Indeed.  Thanks again, martin.