procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove src/s/darwin.h

Browse source 
* configure.ac (opsysfile): Set to empty on darwin.

* src/conf_post.h [DARWIN_OS]: Move remaining contents of src/s/darwin.h here.

* src/s/darwin.h: Remove file.
This commit is contained in:
Glenn Morris 2012-07-30 21:38:04 -04:00
parent c1529dedfc
commit 6a3818523e
5 changed files with 21 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -1,6 +1,6 @@
2012-07-31 Glenn Morris <rgm@gnu.org>
* configure.ac (opsysfile): Set to empty on hpux*.
* configure.ac (opsysfile): Set to empty on hpux*, darwin.
2012-07-30 Glenn Morris <rgm@gnu.org>

1
configure.ac
View file

@ -3688,6 +3688,7 @@ case $opsys in
;;
darwin)
opsysfile=
dnl BSD4_3 and BSD4_4 are already defined in sys/param.h.
AC_DEFINE(BSD4_2, [])
AC_DEFINE(BSD_SYSTEM, [])

3
src/ChangeLog
View file

@ -1,5 +1,8 @@
2012-07-31 Glenn Morris <rgm@gnu.org>
* conf_post.h [DARWIN_OS]: Move remaining contents of s/darwin.h here.
* s/darwin.h: Remove file.
* conf_post.h [HPUX]: Move random, srandom here from s/hpux10-20.h.
* s/hpux10-20.h: Remove file, which is now empty.

16
src/conf_post.h
View file

@ -51,6 +51,22 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#endif
#endif
#ifdef DARWIN_OS
#ifdef emacs
#define malloc unexec_malloc
#define realloc unexec_realloc
#define free unexec_free
/* Don't use posix_memalign because it is not compatible with unexmacosx.c. */
#undef HAVE_POSIX_MEMALIGN
#endif
/* The following solves the problem that Emacs hangs when evaluating
(make-comint "test0" "/nodir/nofile" nil "") when /nodir/nofile
does not exist. Also, setsid is not allowed in the vfork child's
context as of Darwin 9/Mac OS X 10.5. */
#undef HAVE_WORKING_VFORK
#define vfork fork
#endif /* DARWIN_OS */
/* We have to go this route, rather than the old hpux9 approach of
renaming the functions via macros. The system's stdlib.h has fully
prototyped declarations, which yields a conflicting definition of

34
src/s/darwin.h
View file

@ -1,34 +0,0 @@
/* System description header file for Darwin (Mac OS X).
Copyright (C) 2001-2012 Free Software Foundation, Inc.
This file is part of GNU Emacs.
GNU Emacs is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Definitions for how to compile & link. */
#ifdef emacs
#define malloc unexec_malloc
#define realloc unexec_realloc
#define free unexec_free
/* Don't use posix_memalign because it is not compatible with unexmacosx.c. */
#undef HAVE_POSIX_MEMALIGN
#endif
/* The following solves the problem that Emacs hangs when evaluating
(make-comint "test0" "/nodir/nofile" nil "") when /nodir/nofile
does not exist. Also, setsid is not allowed in the vfork child's
context as of Darwin 9/Mac OS X 10.5. */
#undef HAVE_WORKING_VFORK
#define vfork fork