diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-09-25 16:15:16 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-09-25 16:15:16 -0400 |
| commit | 650c20f1ca4e07591a727e1cfcc74b3363d15985 (patch) | |
| tree | 85d11f6437cde22f410c25e0e5f71a3131ebd07d /src/sysselect.h | |
| parent | 8869332684c2302b5ba1ead4568bbc7ba1c0183e (diff) | |
| parent | 4b85ae6a24380fb67a3315eaec9233f17a872473 (diff) | |
| download | emacs-650c20f1ca4e07591a727e1cfcc74b3363d15985.tar.gz emacs-650c20f1ca4e07591a727e1cfcc74b3363d15985.tar.bz2 emacs-650c20f1ca4e07591a727e1cfcc74b3363d15985.zip | |
Merge 'master' into noverlay
Diffstat (limited to 'src/sysselect.h')
| -rw-r--r-- | src/sysselect.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/sysselect.h b/src/sysselect.h index 8295aeb8421..45cc22bc4cb 100644 --- a/src/sysselect.h +++ b/src/sysselect.h @@ -1,5 +1,5 @@ /* sysselect.h - System-dependent definitions for the select function. - Copyright (C) 1995, 2001-2017 Free Software Foundation, Inc. + Copyright (C) 1995, 2001-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -50,6 +50,11 @@ typedef int fd_set; #endif #ifdef MSDOS +/* The above #define for 'select' gets in the way because sysselect.h + is included in thread.h, which is included everywhere, and 'select' + declared in DJGPP system headers has a signature incompatible with + 'pselect', which we emulate in msdos.c. */ +#undef select #define pselect sys_select #endif |