Merged from miles@gnu.org--gnu-2005 (patch 14-16, 95-106)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-95
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-96
   Move Gnus images into etc/images

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-97
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-98
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-99
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-100
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-101
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-102
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-103
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-104
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-105
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-106
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-14
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-15
   Update from CVS: lisp/imap.el (imap-log): Doc fix.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-16
   Merge from emacs--cvs-trunk--0

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-295

1 files changed, 2 insertions, 0 deletions

diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 09d31ed2e04..503c8547c69 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -477,8 +477,10 @@ extern char *get_emacs_configuration_options (void);
    must include config.h to pick up this pragma.  */
 
 /* Names must be < 8 bytes */
+#ifdef _MSC_VER
 #pragma data_seg("EMDATA")
 #pragma bss_seg("EMBSS")
+#endif
 
 /* #define FULL_DEBUG */
 /* #define EMACSDEBUG */