[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r111952: Merge from emacs-24; up to r
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r111952: Merge from emacs-24; up to r111323 |
Date: |
Wed, 06 Mar 2013 00:01:47 -0800 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111952 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-03-06 00:01:47 -0800
message:
Merge from emacs-24; up to r111323
modified:
ChangeLog
configure.ac
src/ChangeLog
src/sysdep.c
=== modified file 'ChangeLog'
--- a/ChangeLog 2013-03-05 03:59:35 +0000
+++ b/ChangeLog 2013-03-06 08:01:47 +0000
@@ -1,3 +1,8 @@
+2013-03-06 Paul Eggert <address@hidden>
+
+ * configure.ac (TERM_HEADER): Remove duplicate definition (Bug#13872).
+ It can mess up 'configure' runs.
+
2013-03-05 Glenn Morris <address@hidden>
* Makefile.in (install-man): Ignore gzip exit status.
=== modified file 'configure.ac'
--- a/configure.ac 2013-03-05 22:35:41 +0000
+++ b/configure.ac 2013-03-06 08:01:47 +0000
@@ -1580,11 +1580,6 @@
;;
esac
-if test -n "${term_header}"; then
- AC_DEFINE_UNQUOTED(TERM_HEADER, "${term_header}",
- [Define to the header for the built-in window system.])
-fi
-
if test "$window_system" = none && test "X$with_x" != "Xno"; then
AC_CHECK_PROG(HAVE_XSERVER, X, true, false)
if test "$HAVE_XSERVER" = true ||
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-03-05 23:08:11 +0000
+++ b/src/ChangeLog 2013-03-06 08:01:47 +0000
@@ -1,3 +1,15 @@
+2013-03-06 Paul Eggert <address@hidden>
+
+ Fix a build failure on OpenBSD 4.x and MirBSD (Bug#13881).
+ * sysdep.c (list_system_processes)
+ [BSD_SYSTEM && !DARWIN_OS && !__FreeBSD__]:
+ Make it a stub in this case; otherwise the build might fail,
+ and this code hasn't been tested on such hosts anyway.
+ Problem reported by Nelson H. F. Beebe in
+ <http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00021.html>
+ and analyzed by Jérémie Courrèges-Anglas in
+ <http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00062.html>.
+
2013-03-06 Dmitry Antipov <address@hidden>
* lisp.h (find_next_newline_no_quit): Rename to find_next_newline.
@@ -65,16 +77,6 @@
to be in sync with bidi_it->bytepos. Suggested by Dmitry Antipov
<address@hidden>.
-2013-03-05 Paul Eggert <address@hidden>
-
- Fix a build failure on OpenBSD 4.x and MirBSD.
- * sysdep.c (KERN_PROC, kinfo_proc)
- [BSD_SYSTEM && (!KERN_PROC || __MirBSD__)]:
- Define to KERN_PROC2 and kinfo_proc2, for OpenBSD 4.9 and MirBSD.
- list-system-processes still returns nil, but at least it doesn't crash.
- Problem reported by Nelson H. F. Beebe in
- <http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00021.html>.
-
2013-03-05 Dmitry Antipov <address@hidden>
* composite.c (get_composition_id, fill_gstring_header):
=== modified file 'src/sysdep.c'
--- a/src/sysdep.c 2013-03-05 03:59:35 +0000
+++ b/src/sysdep.c 2013-03-06 08:01:47 +0000
@@ -2541,20 +2541,12 @@
return proclist;
}
-#elif defined BSD_SYSTEM
-
-/* OpenBSD 4.9 and earlier do not have KERN_PROC. Approximate it with
- KERN_PROC2. MirBSD's KERN_PROC seems to be busted. */
-# if !defined KERN_PROC || defined __MirBSD__
-# undef KERN_PROC
-# define KERN_PROC KERN_PROC2
-# define kinfo_proc kinfo_proc2
-# endif
+#elif defined DARWIN_OS || defined __FreeBSD__
Lisp_Object
list_system_processes (void)
{
-#if defined DARWIN_OS || defined __NetBSD__ || defined __OpenBSD__
+#ifdef DARWIN_OS
int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_ALL};
#else
int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PROC};
@@ -2580,10 +2572,8 @@
len /= sizeof (struct kinfo_proc);
for (i = 0; i < len; i++)
{
-#if defined DARWIN_OS || defined __NetBSD__
+#ifdef DARWIN_OS
proclist = Fcons (make_fixnum_or_float (procs[i].kp_proc.p_pid),
proclist);
-#elif defined __OpenBSD__
- proclist = Fcons (make_fixnum_or_float (procs[i].p_pid), proclist);
#else
proclist = Fcons (make_fixnum_or_float (procs[i].ki_pid), proclist);
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r111952: Merge from emacs-24; up to r111323,
Glenn Morris <=