X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/3ef31cb524d49c45c80da2779bb3fbde7625744f..61e1d1ca4f04460699287e66a57e722328a641be:/src/sysselect.h diff --git a/src/sysselect.h b/src/sysselect.h index 139960031a..ba204dafe3 100644 --- a/src/sysselect.h +++ b/src/sysselect.h @@ -1,5 +1,6 @@ /* sysselect.h - System-dependent definitions for the select function. - Copyright (C) 1995 Free Software Foundation, Inc. + Copyright (C) 1995, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -15,10 +16,17 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ -#ifdef HAVE_SYS_SELECT +#ifdef HAVE_SYS_SELECT_H +#if defined (DARWIN) || defined (MAC_OSX) +#undef init_process +#endif #include +#if defined (DARWIN) || defined (MAC_OSX) +#define init_process emacs_init_process +#endif #endif #ifdef FD_SET @@ -42,3 +50,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #if !defined (HAVE_SELECT) || defined (BROKEN_SELECT_NON_X) #define select sys_select #endif + +/* arch-tag: 36d05500-8cf6-4847-8e78-6721f18c06ef + (do not change this comment) */