diff options
author | Martin v. Löwis <martin@v.loewis.de> | 2003-01-01 09:51:12 (GMT) |
---|---|---|
committer | Martin v. Löwis <martin@v.loewis.de> | 2003-01-01 09:51:12 (GMT) |
commit | 14e73b186414d6e67cad9924ad72fab1a7d70861 (patch) | |
tree | 4989e166bf359950f0f0d3960175e241840aeadf /Modules | |
parent | 33fb554a135720783efb18bb3b3ae382e03ea0d4 (diff) | |
download | cpython-14e73b186414d6e67cad9924ad72fab1a7d70861.zip cpython-14e73b186414d6e67cad9924ad72fab1a7d70861.tar.gz cpython-14e73b186414d6e67cad9924ad72fab1a7d70861.tar.bz2 |
Expose I_ constants. Auto-detect stropts.h. Properly configure the slave terminal.
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/fcntlmodule.c | 39 | ||||
-rw-r--r-- | Modules/posixmodule.c | 4 |
2 files changed, 40 insertions, 3 deletions
diff --git a/Modules/fcntlmodule.c b/Modules/fcntlmodule.c index 360b54e..c5d9b4d 100644 --- a/Modules/fcntlmodule.c +++ b/Modules/fcntlmodule.c @@ -9,7 +9,9 @@ #include <sys/ioctl.h> #include <fcntl.h> - +#ifdef HAVE_STROPTS_H +#include <stropts.h> +#endif static int conv_descriptor(PyObject *object, int *target) @@ -337,6 +339,8 @@ ins(PyObject* d, char* symbol, long value) return 0; } +#define INS(x) if (ins(d, #x, (long)x)) return -1 + static int all_ins(PyObject* d) { @@ -459,6 +463,39 @@ all_ins(PyObject* d) if (ins(d, "DN_MULTISHOT", (long)DN_MULTISHOT)) return -1; #endif +#ifdef HAVE_STROPTS_H + /* Unix 98 guarantees that these are in stropts.h. */ + INS(I_PUSH); + INS(I_POP); + INS(I_LOOK); + INS(I_FLUSH); + INS(I_FLUSHBAND); + INS(I_SETSIG); + INS(I_GETSIG); + INS(I_FIND); + INS(I_PEEK); + INS(I_SRDOPT); + INS(I_GRDOPT); + INS(I_NREAD); + INS(I_FDINSERT); + INS(I_STR); + INS(I_SWROPT); + INS(I_GWROPT); + INS(I_SENDFD); + INS(I_RECVFD); + INS(I_LIST); + INS(I_ATMARK); + INS(I_CKBAND); + INS(I_GETBAND); + INS(I_CANPUT); + INS(I_SETCLTIME); + INS(I_GETCLTIME); + INS(I_LINK); + INS(I_UNLINK); + INS(I_PLINK); + INS(I_PUNLINK); +#endif + return 0; } diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index dff478a..cce8011 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -2726,8 +2726,8 @@ posix_fork(PyObject *self, PyObject *args) #include <libutil.h> #endif /* HAVE_LIBUTIL_H */ #endif /* HAVE_PTY_H */ -#if defined(sun) || defined(__hpux) -#include <sys/stropts.h> +#ifdef HAVE_STROPTS_H +#include <stropts.h> #endif #endif /* defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) || defined(HAVE_DEV_PTMX */ |