aboutsummaryrefslogtreecommitdiffstats
path: root/src/mac.c
diff options
context:
space:
mode:
authorMiles Bader2005-02-06 12:06:02 +0000
committerMiles Bader2005-02-06 12:06:02 +0000
commita359f0e0ff878285654e2f0bcc7bd3b4340c778c (patch)
treecc0aff13c751bb8ab7ccaae29082bab32e15fd13 /src/mac.c
parentf3d3402885646e6fa79f1ad59fb8a1f9017851d7 (diff)
parent56c30d721096a64f151f9ea6e3c76562380da895 (diff)
downloademacs-a359f0e0ff878285654e2f0bcc7bd3b4340c778c.tar.gz
emacs-a359f0e0ff878285654e2f0bcc7bd3b4340c778c.zip
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-11
Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-69 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-71 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-72 src/dispextern.h (xassert): Enable unconditionally. * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-73 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-81 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-82 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-12 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-13 Update from CVS
Diffstat (limited to 'src/mac.c')
-rw-r--r--src/mac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mac.c b/src/mac.c
index 99e0d44830b..cce1b858cb3 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -2858,7 +2858,7 @@ select_and_poll_event (n, rfds, wfds, efds, timeout)
2858 return r; 2858 return r;
2859} 2859}
2860 2860
2861#ifndef MAC_OS_X_VERSION_10_2 2861#if MAC_OS_X_VERSION_MAX_ALLOWED < 1020
2862#undef SELECT_INVALIDATE_CFSOCKET 2862#undef SELECT_INVALIDATE_CFSOCKET
2863#endif 2863#endif
2864 2864