NOTE: This patch has been committed.
Adrian wrote:
xemacs.mak got rid of HAVE_MSW_C_DIRED, but still seems to compile
dired-msw.c and link in dired-msw.obj.
src/ChangeLog addition:
2002-07-05 Jonathan Harris <jonathan(a)xemacs.org>
* emacs.c (main_1): Conditionalise calls to
syms_of_dired_mswindows() and vars_of_dired_mswindows() on
WIN32_NATIVE instead of redundant HAVE_MSW_C_DIRED
xemacs-21.5 source patch:
Diff command: cvs -q diff -u
Files affected: src/emacs.c
Index: src/emacs.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/emacs.c,v
retrieving revision 1.124
diff -u -u -r1.124 emacs.c
--- src/emacs.c 2002/07/04 13:57:03 1.124
+++ src/emacs.c 2002/07/05 22:08:19
@@ -1362,10 +1362,8 @@
syms_of_scrollbar_mswindows ();
#endif
#endif /* HAVE_MS_WINDOWS */
-#ifdef HAVE_MSW_C_DIRED
- syms_of_dired_mswindows ();
-#endif
#ifdef WIN32_NATIVE
+ syms_of_dired_mswindows ();
syms_of_nt ();
#endif
#if defined (WIN32_NATIVE) || defined (CYGWIN)
@@ -1772,6 +1770,7 @@
vars_of_module ();
#endif
#ifdef WIN32_NATIVE
+ vars_of_dired_mswindows ();
vars_of_nt ();
#endif
vars_of_objects ();
@@ -1875,9 +1874,6 @@
#endif
#ifdef HAVE_MENUBARS
vars_of_menubar_mswindows ();
-#endif
-#ifdef HAVE_MSW_C_DIRED
- vars_of_dired_mswindows ();
#endif
#ifdef HAVE_DIALOGS
vars_of_dialog_mswindows ();