diff options
| author | Xue Fuqiao | 2013-09-04 08:39:34 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-09-04 08:39:34 +0800 |
| commit | adf2fc4a01efe77d73cd52bc9173914ed56ff531 (patch) | |
| tree | a5a280a5554a7bffeaf94fccae29fa3ac1a5d066 /src/sysselect.h | |
| parent | 63191d9f2043d2e67657e85a7b3842805dd1dad6 (diff) | |
| parent | 38726039b77db432989fed106c88e9f1aa463281 (diff) | |
| download | emacs-adf2fc4a01efe77d73cd52bc9173914ed56ff531.tar.gz emacs-adf2fc4a01efe77d73cd52bc9173914ed56ff531.zip | |
Merge from mainline.
Diffstat (limited to 'src/sysselect.h')
| -rw-r--r-- | src/sysselect.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/sysselect.h b/src/sysselect.h index 0a4f7e3ad96..5df0af9ed37 100644 --- a/src/sysselect.h +++ b/src/sysselect.h | |||
| @@ -25,15 +25,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 25 | definitions in w32.h are incompatible with the below. */ | 25 | definitions in w32.h are incompatible with the below. */ |
| 26 | #ifndef WINDOWSNT | 26 | #ifndef WINDOWSNT |
| 27 | #ifdef FD_SET | 27 | #ifdef FD_SET |
| 28 | #ifdef FD_SETSIZE | 28 | #ifndef FD_SETSIZE |
| 29 | #define MAXDESC FD_SETSIZE | 29 | #define FD_SETSIZE 64 |
| 30 | #else | ||
| 31 | #define MAXDESC 64 | ||
| 32 | #endif | 30 | #endif |
| 33 | #define SELECT_TYPE fd_set | ||
| 34 | #else /* no FD_SET */ | 31 | #else /* no FD_SET */ |
| 35 | #define MAXDESC 32 | 32 | #define FD_SETSIZE 32 |
| 36 | #define SELECT_TYPE int | 33 | typedef int fd_set; |
| 37 | 34 | ||
| 38 | /* Define the macros to access a single-int bitmap of descriptors. */ | 35 | /* Define the macros to access a single-int bitmap of descriptors. */ |
| 39 | #define FD_SET(n, p) (*(p) |= (1 << (n))) | 36 | #define FD_SET(n, p) (*(p) |= (1 << (n))) |