diff options
| author | Adrian Robert | 2008-07-15 18:15:18 +0000 |
|---|---|---|
| committer | Adrian Robert | 2008-07-15 18:15:18 +0000 |
| commit | edfda78355c5528eee489fa8a7f9c73bf8e734f2 (patch) | |
| tree | 78d2414d9791e1efc17ec9b35b438ae35602340a /src/sysselect.h | |
| parent | 1391cd548782097e34d7856ec4f20ca90bdf2c26 (diff) | |
| download | emacs-edfda78355c5528eee489fa8a7f9c73bf8e734f2.tar.gz emacs-edfda78355c5528eee489fa8a7f9c73bf8e734f2.zip | |
merging Emacs.app (NeXTstep port)
Diffstat (limited to 'src/sysselect.h')
| -rw-r--r-- | src/sysselect.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sysselect.h b/src/sysselect.h index 24731e56f1f..e11d5ce04ac 100644 --- a/src/sysselect.h +++ b/src/sysselect.h | |||
| @@ -18,11 +18,11 @@ You should have received a copy of the GNU General Public License | |||
| 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 19 | 19 | ||
| 20 | #ifdef HAVE_SYS_SELECT_H | 20 | #ifdef HAVE_SYS_SELECT_H |
| 21 | #if defined (DARWIN) || defined (MAC_OSX) | 21 | #if defined (DARWIN) || defined (MAC_OSX) || defined (NS_IMPL_COCOA) |
| 22 | #undef init_process | 22 | #undef init_process |
| 23 | #endif | 23 | #endif |
| 24 | #include <sys/select.h> | 24 | #include <sys/select.h> |
| 25 | #if defined (DARWIN) || defined (MAC_OSX) | 25 | #if defined (DARWIN) || defined (MAC_OSX) || defined (NS_IMPL_COCOA) |
| 26 | #define init_process emacs_init_process | 26 | #define init_process emacs_init_process |
| 27 | #endif | 27 | #endif |
| 28 | #endif | 28 | #endif |