diff options
author | Adrian Robert <Adrian.B.Robert@gmail.com> | 2008-07-15 18:15:18 +0000 |
---|---|---|
committer | Adrian Robert <Adrian.B.Robert@gmail.com> | 2008-07-15 18:15:18 +0000 |
commit | edfda78355c5528eee489fa8a7f9c73bf8e734f2 (patch) | |
tree | 78d2414d9791e1efc17ec9b35b438ae35602340a /src/sysselect.h | |
parent | 1391cd548782097e34d7856ec4f20ca90bdf2c26 (diff) | |
download | emacs-edfda78355c5528eee489fa8a7f9c73bf8e734f2.tar.gz |
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 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_SYS_SELECT_H -#if defined (DARWIN) || defined (MAC_OSX) +#if defined (DARWIN) || defined (MAC_OSX) || defined (NS_IMPL_COCOA) #undef init_process #endif #include <sys/select.h> -#if defined (DARWIN) || defined (MAC_OSX) +#if defined (DARWIN) || defined (MAC_OSX) || defined (NS_IMPL_COCOA) #define init_process emacs_init_process #endif #endif |