(CODING_CATEGORY_MASK_BINARY): New macro.

[gnu-emacs] / src / systty.h

diff --git a/src/systty.h b/src/systty.h
index 59e5ad813f73acd8b3a6bef16be4a51cd7d1d94e..4b8c2262ea0a2b5079f340b37a401f9ba900aa0f 100644 (file)
--- a/src/systty.h
+++ b/src/systty.h
@@ -63,12 +63,12 @@ Boston, MA 02111-1307, USA.  */
 #if defined(_AIX) && defined(_I386)
 #include <termios.h>           /* termios.h needs to be before termio.h */
 #include <termio.h>
-#else /* not HAVE_TERMIOS */
+#else /* not (_AIX && _I386) */
 #ifndef NO_TERMIO
 #include <termio.h>
 #endif
 #include <termios.h>
-#endif /* _AIX && _I386 */
+#endif /* not (_AIX && _I386) */
 #define INCLUDED_FCNTL
 #include <fcntl.h>
 #else /* neither HAVE_TERMIO nor HAVE_TERMIOS */
@@ -295,8 +295,16 @@ static struct sensemode {
 /* EMACS_GETPGRP (arg) returns the process group of the process.  */
 
 #ifdef __GNU_LIBRARY__
-/* GNU libc by default defines getpgrp with no args on all systems.  */.
+/* GNU libc by default defines getpgrp with no args on all systems.  */
+#if __GLIBC__  >= 2
+/* glibc-2.1 adds the BSD compatibility getpgrp function
+   if you use __BSD_SOURCE, which Emacs does on GNU/Linux systems.  */
+#if __GLIBC_MINOR__ < 1 || ! defined (_BSD_SOURCE)
 #define GETPGRP_NO_ARG
+#endif
+#else /* __GLIBC__ < 2 */
+#define GETPGRP_NO_ARG
+#endif /* __GLIBC__ < 2 */
 #else /* not __GNU_LIBRARY__ */
 #if defined (USG) && !defined (GETPGRP_NEEDS_ARG)
 #  if !defined (GETPGRP_NO_ARG)