projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gettimeofday: port recent C++ fix to Emacs
[gnulib.git]
/
lib
/
termios.in.h
diff --git
a/lib/termios.in.h
b/lib/termios.in.h
index
3836e2d
..
540cb5f
100644
(file)
--- a/
lib/termios.in.h
+++ b/
lib/termios.in.h
@@
-1,5
+1,5
@@
/* Substitute for and wrapper around <termios.h>.
/* Substitute for and wrapper around <termios.h>.
- Copyright (C) 2010-201
2
Free Software Foundation, Inc.
+ Copyright (C) 2010-201
3
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-32,12
+32,6
@@
extern "C" {
}
#endif
}
#endif
-/* On Cygwin 1.7.11, tcgetsid returns int instead of pid_t; at least
- they are the same size on that platform. */
-#ifdef __CYGWIN__
-# include <sys/types.h>
-#endif
-
/* The include_next requires a split double-inclusion guard. */
#if @HAVE_TERMIOS_H@
# @INCLUDE_NEXT@ @NEXT_TERMIOS_H@
/* The include_next requires a split double-inclusion guard. */
#if @HAVE_TERMIOS_H@
# @INCLUDE_NEXT@ @NEXT_TERMIOS_H@
@@
-46,10
+40,8
@@
extern "C" {
#ifndef _@GUARD_PREFIX@_TERMIOS_H
#define _@GUARD_PREFIX@_TERMIOS_H
#ifndef _@GUARD_PREFIX@_TERMIOS_H
#define _@GUARD_PREFIX@_TERMIOS_H
-#if @GNULIB_TCGETSID@
/* Get pid_t. */
/* Get pid_t. */
-# include <sys/types.h>
-#endif
+#include <sys/types.h>
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */