diff options
| author | Kenichi Handa | 2012-07-17 07:25:00 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-07-17 07:25:00 +0900 |
| commit | 69c41c4070c86baac11a627e9c3d366420aeb7cc (patch) | |
| tree | e07fda92570b5e4f264c9a7869b57960940008f0 /src/sysselect.h | |
| parent | 8c536f15bf95916d56bb50495d22b7da7e09fff9 (diff) | |
| parent | 758e556a7ab8f61c007e34310ba399a9aaf15362 (diff) | |
| download | emacs-69c41c4070c86baac11a627e9c3d366420aeb7cc.tar.gz emacs-69c41c4070c86baac11a627e9c3d366420aeb7cc.zip | |
merge trunk
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 f9b9fc00b35..24bdf469ced 100644 --- a/src/sysselect.h +++ b/src/sysselect.h | |||
| @@ -16,14 +16,8 @@ GNU General Public License for more details. | |||
| 16 | You should have received a copy of the GNU General Public License | 16 | You should have received a copy of the GNU General Public License |
| 17 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 17 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 18 | 18 | ||
| 19 | #ifdef HAVE_SYS_SELECT_H | 19 | #ifndef DOS_NT |
| 20 | #if defined (DARWIN_OS) | ||
| 21 | #undef init_process | ||
| 22 | #endif | ||
| 23 | #include <sys/select.h> | 20 | #include <sys/select.h> |
| 24 | #if defined (DARWIN_OS) | ||
| 25 | #define init_process emacs_init_process | ||
| 26 | #endif | ||
| 27 | #endif | 21 | #endif |
| 28 | 22 | ||
| 29 | /* The w32 build defines select stuff in w32.h, which is included | 23 | /* The w32 build defines select stuff in w32.h, which is included |
| @@ -53,3 +47,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 53 | #define select sys_select | 47 | #define select sys_select |
| 54 | #endif | 48 | #endif |
| 55 | 49 | ||
| 50 | #ifdef MSDOS | ||
| 51 | #define pselect sys_select | ||
| 52 | #endif | ||