[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109308: Remove src/s/darwin.h
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109308: Remove src/s/darwin.h |
Date: |
Mon, 30 Jul 2012 21:38:04 -0400 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109308
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-07-30 21:38:04 -0400
message:
Remove src/s/darwin.h
* 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.
removed:
src/s/darwin.h
modified:
ChangeLog
configure.ac
src/ChangeLog
src/conf_post.h
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-07-31 01:32:19 +0000
+++ b/ChangeLog 2012-07-31 01:38:04 +0000
@@ -1,6 +1,6 @@
2012-07-31 Glenn Morris <address@hidden>
- * configure.ac (opsysfile): Set to empty on hpux*.
+ * configure.ac (opsysfile): Set to empty on hpux*, darwin.
2012-07-30 Glenn Morris <address@hidden>
=== modified file 'configure.ac'
--- a/configure.ac 2012-07-31 01:32:19 +0000
+++ b/configure.ac 2012-07-31 01:38:04 +0000
@@ -3688,6 +3688,7 @@
;;
darwin)
+ opsysfile=
dnl BSD4_3 and BSD4_4 are already defined in sys/param.h.
AC_DEFINE(BSD4_2, [])
AC_DEFINE(BSD_SYSTEM, [])
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-07-31 01:32:19 +0000
+++ b/src/ChangeLog 2012-07-31 01:38:04 +0000
@@ -1,5 +1,8 @@
2012-07-31 Glenn Morris <address@hidden>
+ * 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.
=== modified file 'src/conf_post.h'
--- a/src/conf_post.h 2012-07-31 01:32:19 +0000
+++ b/src/conf_post.h 2012-07-31 01:38:04 +0000
@@ -51,6 +51,22 @@
#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
=== removed file 'src/s/darwin.h'
--- a/src/s/darwin.h 2012-07-13 02:34:05 +0000
+++ b/src/s/darwin.h 1970-01-01 00:00:00 +0000
@@ -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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109308: Remove src/s/darwin.h,
Glenn Morris <=