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

Account for utmp.h availability.

Browse source 
* configure.in: Check for utmp.h availability (FreeBSD 9.x lacks
this header file).

* filelock.c: Include utmp.h only when HAVE_UTMP_H (FreeBSD 9.x
lacks this header file).
This commit is contained in:
Chong Yidong 2010-01-23 17:15:22 -05:00
parent 5336c3ec74
commit c6d09b8da9
5 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2010-01-23 Giorgos Keramidas <keramida@ceid.upatras.gr> (tiny change)
* configure.in: Check for utmp.h availability (FreeBSD 9.x lacks
this header file).
2010-01-12 Juanma Barranquero <lekktu@gmail.com>
* .bzrignore: Ignore all .exe, instead of individual files.

3
configure vendored
View file

@ -6663,13 +6663,14 @@ fi
for ac_header in sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \
termcap.h stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \
sys/param.h sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \
sys/utsname.h pwd.h
sys/utsname.h pwd.h utmp.h
do
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

2
configure.in
View file

@ -1106,7 +1106,7 @@ AC_CHECK_HEADERS(sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \
termcap.h stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \
sys/param.h sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \
sys/utsname.h pwd.h)
sys/utsname.h pwd.h utmp.h)
AC_MSG_CHECKING(if personality LINUX32 can be set)
AC_TRY_COMPILE([#include <sys/personality.h>], [personality (PER_LINUX32)],

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2010-01-23 Giorgos Keramidas <keramida@ceid.upatras.gr> (tiny change)
* filelock.c: Include utmp.h only when HAVE_UTMP_H (FreeBSD 9.x
lacks this header file).
2010-01-23 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* xdisp.c (draw_glyphs): Update `start' for left_overwritten case

2
src/filelock.c
View file

@ -63,7 +63,9 @@ Lisp_Object Vtemporary_file_directory;
#ifdef CLASH_DETECTION
#ifdef HAVE_UTMP_H
#include <utmp.h>
#endif
#if !defined (S_ISLNK) && defined (S_IFLNK)
#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)