diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-07-30 23:43:37 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-07-30 23:43:37 -0700 |
| commit | 268e2432c9fce95a332c480f7c598063dad0019a (patch) | |
| tree | 9e3e2844b71012b5859f86b06d337f76d94781dc /src/conf_post.h | |
| parent | 400d5621b84deaacc6d4046d21d4d40b80402786 (diff) | |
| download | emacs-268e2432c9fce95a332c480f7c598063dad0019a.tar.gz | |
Remove src/s/usg5-4-common.h
* configure.ac (USG5_4): Reintroduce this.
(opsysfile): Set to empty on irix6-5, sol2*, and unixware.
* src/conf_post.h [USG5_4]: Move remaining contents of s/usg5-4-common.h here.
* src/s/usg5-4-common.h: Remove file.
Diffstat (limited to 'src/conf_post.h')
| -rw-r--r-- | src/conf_post.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/conf_post.h b/src/conf_post.h index 32fdc899da9..f84d6ae6f42 100644 --- a/src/conf_post.h +++ b/src/conf_post.h @@ -84,7 +84,23 @@ char *_getpty(); #endif #undef SA_RESTART /* not the same as defining BROKEN_SA_RESTART */ +#endif /* IRIX6_5 */ + +#ifdef USG5_4 +/* Get FIONREAD from <sys/filio.h>. Get <sys/ttold.h> to get struct tchars. + But get <termio.h> first to make sure ttold.h doesn't interfere. */ +#include <sys/wait.h> + +#ifdef emacs +#include <sys/filio.h> +#include <termio.h> +#include <sys/ttold.h> +#include <signal.h> +#include <sys/stream.h> +#include <sys/stropts.h> +#include <sys/termios.h> #endif +#endif /* USG5_4 */ /* Define AMPERSAND_FULL_NAME if you use the convention that & in the full name stands for the login id. */ |