Merged from miles@gnu.org--gnu-2005 (patch 39-44, 184-191)

Patches applied:

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

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

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

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

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

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

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

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

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-40
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-41
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-42
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-43
   Update from CVS

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

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

1 files changed, 3 insertions, 11 deletions

diff --git a/src/coding.h b/src/coding.h
index ed31a7d7c94..f363032228d 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -1,5 +1,5 @@
 /* Header for coding system handler.
-   Copyright (C) 2004  Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005  Free Software Foundation, Inc.
    Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN.
    Licensed to the Free Software Foundation.
 
@@ -591,9 +591,8 @@ struct coding_system
       ? code_convert_string_norecord (name, Vdefault_file_name_coding_system, 0) \
       : name))
 
-#ifdef WINDOWSNT
 /* Encode the string STR using the specified coding system
-   for w32 system functions, if any.  */
+   for system functions, if any.  */
 #define ENCODE_SYSTEM(str)                                                 \
   (! NILP (Vlocale_coding_system)                                          \
    && !EQ (Vlocale_coding_system, make_number (0))                         \
@@ -601,20 +600,13 @@ struct coding_system
    : str)
 
 /* Decode the string STR using the specified coding system
-   for w32 system functions, if any.  */
+   for system functions, if any.  */
 #define DECODE_SYSTEM(name)                                                \
   (! NILP (Vlocale_coding_system)                                          \
    && !EQ (Vlocale_coding_system, make_number (0))                         \
    ? code_convert_string_norecord (str, Vlocale_coding_system, 0)          \
    : str)
 
-#else /* WINDOWSNT */
-
-#define ENCODE_SYSTEM(str) string_make_unibyte(str)
-#define DECODE_SYSTEM(name) name
-
-#endif /* !WINDOWSNT */
-
 #define ENCODE_UTF_8(str) code_convert_string_norecord (str, Qutf_8, 1)
 
 /* Extern declarations.  */