aboutsummaryrefslogtreecommitdiffstats
path: root/src/sysselect.h
diff options
context:
space:
mode:
authorAdrian Robert2008-08-04 14:39:27 +0000
committerAdrian Robert2008-08-04 14:39:27 +0000
commit14145fa3d03d61fec15d5939b5c4417c9d6472d9 (patch)
tree3720d80ab307127573cb2f685536a2e1c570198e /src/sysselect.h
parentd7982012851b8772c623287a11aa497e15ac6c3d (diff)
downloademacs-14145fa3d03d61fec15d5939b5c4417c9d6472d9.tar.gz
emacs-14145fa3d03d61fec15d5939b5c4417c9d6472d9.zip
cleanup in s/darwin.h, define DARWIN_OS and use it instead of DARWIN and/or MAC_OSX; also, nsterm.m: small unrelated cleanups
Diffstat (limited to 'src/sysselect.h')
-rw-r--r--src/sysselect.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sysselect.h b/src/sysselect.h
index 7a8a185e49c..c6d483b6f37 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
18along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ 18along 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 (NS_IMPL_COCOA) 21#if defined (DARWIN_OS)
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 (NS_IMPL_COCOA) 25#if defined (DARWIN_OS)
26#define init_process emacs_init_process 26#define init_process emacs_init_process
27#endif 27#endif
28#endif 28#endif