Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
89d17fd0
Commit
89d17fd0
authored
Sep 27, 2012
by
Paul Eggert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Link with LIB_TIMER_TIME as needed.
parent
e28e67b3
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
2 deletions
+13
-2
ChangeLog
ChangeLog
+1
-0
msdos/ChangeLog
msdos/ChangeLog
+5
-0
msdos/sed1v2.inp
msdos/sed1v2.inp
+1
-0
msdos/sed3v2.inp
msdos/sed3v2.inp
+1
-0
src/ChangeLog
src/ChangeLog
+2
-0
src/Makefile.in
src/Makefile.in
+3
-2
No files found.
ChangeLog
View file @
89d17fd0
...
...
@@ -5,6 +5,7 @@
<http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00671.html>.
* configure.ac (gl_THREADLIB): Define to empty, since Emacs
does threads its own way.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
2012-09-23 Paul Eggert <eggert@cs.ucla.edu>
...
...
msdos/ChangeLog
View file @
89d17fd0
2012-09-27 Paul Eggert <eggert@cs.ucla.edu>
Check more robustly for timer_settime.
* sed1v2.inp, sed3v2.inp (LIB_TIMER_TIME): New macro.
2012-08-04 Eli Zaretskii <eliz@gnu.org>
* sedlibmk.inp (allocator.$(OBJEXT), careadlinkat.$(OBJEXT)): Fix
...
...
msdos/sed1v2.inp
View file @
89d17fd0
...
...
@@ -106,6 +106,7 @@ s/\.h\.in/.h-in/
/^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@//
/^LIB_PTHREAD_SIGMASK *=/s/@[^@\n]*@//
/^LIB_CLOCK_GETTIME *=/s/@[^@\n]*@//g
/^LIB_TIMER_TIME *=/s/@[^@\n]*@//g
/^LIBGNUTLS_LIBS *=/s/@[^@\n]*@//
/^LIBGNUTLS_CFLAGS *=/s/@[^@\n]*@//
/^GETLOADAVG_LIBS *=/s/@[^@\n]*@//
...
...
msdos/sed3v2.inp
View file @
89d17fd0
...
...
@@ -36,6 +36,7 @@ s/-DVERSION[^ ]* //
/^LIBS_MAIL *=/s/@[^@\n]*@//g
/^LIBS_SYSTEM *=/s/@[^@\n]*@//g
/^LIB_CLOCK_GETTIME *=/s/@[^@\n]*@//g
/^LIB_TIMER_TIME *=/s/@[^@\n]*@//g
/^CFLAGS *=/s!=.*$!=-O2 -g!
/^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS -I../msdos!
/^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@//
...
...
src/ChangeLog
View file @
89d17fd0
2012-09-27 Paul Eggert <eggert@cs.ucla.edu>
Check more robustly for timer_settime.
* Makefile.in (LIB_TIMER_TIME): New macro.
(LIBES): Add it.
* atimer.c (alarm_timer, alarm_timer_ok, set_alarm, init_atimer):
Use HAVE_TIMER_SETTIME, not SIGEV_SIGNAL, to decide whether to
call timer_settime.
...
...
src/Makefile.in
View file @
89d17fd0
...
...
@@ -153,6 +153,7 @@ M17N_FLT_CFLAGS = @M17N_FLT_CFLAGS@
M17N_FLT_LIBS
=
@M17N_FLT_LIBS@
LIB_CLOCK_GETTIME
=
@LIB_CLOCK_GETTIME@
LIB_TIMER_TIME
=
@LIB_TIMER_TIME@
DBUS_CFLAGS
=
@DBUS_CFLAGS@
DBUS_LIBS
=
@DBUS_LIBS@
...
...
@@ -385,8 +386,8 @@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(GMALLOC_OBJ) $(RALLOC_OBJ) \
## duplicated symbols. If the standard libraries were compiled
## with GCC, we might need LIB_GCC again after them.
LIBES
=
$(LIBS)
$(LIBX_BASE)
$(LIBX_OTHER)
$(LIBSOUND)
\
$(RSVG_LIBS)
$(IMAGEMAGICK_LIBS)
$(LIB_CLOCK_GETTIME)
$(
DBUS_LIBS
)
\
$(LIB_EXECINFO)
\
$(RSVG_LIBS)
$(IMAGEMAGICK_LIBS)
$(LIB_CLOCK_GETTIME)
$(
LIB_TIMER_TIME
)
\
$(DBUS_LIBS)
$(LIB_EXECINFO)
\
$(LIBXML2_LIBS)
$(LIBGPM)
$(LIBRESOLV)
$(LIBS_SYSTEM)
\
$(LIBS_TERMCAP)
$(GETLOADAVG_LIBS)
$(SETTINGS_LIBS)
$(LIBSELINUX_LIBS)
\
$(FREETYPE_LIBS)
$(FONTCONFIG_LIBS)
$(LIBOTF_LIBS)
$(M17N_FLT_LIBS)
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment