[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r108713: Avoid compiler warnings in c
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r108713: Avoid compiler warnings in comparing time_t. |
Date: |
Sat, 23 Jun 2012 22:40:50 +0300 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108713
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2012-06-23 22:40:50 +0300
message:
Avoid compiler warnings in comparing time_t.
src/dispnew.c (sit_for, Fsleep_for):
src/keyboard.c (kbd_buffer_get_event):
src/process.c (Faccept_process_output): Avoid compiler warnings when
comparing a 32-bit time_t with a 64-bit INTMAX_MAX.
modified:
src/ChangeLog
src/dispnew.c
src/keyboard.c
src/process.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-06-23 19:28:01 +0000
+++ b/src/ChangeLog 2012-06-23 19:40:50 +0000
@@ -1,3 +1,10 @@
+2012-06-23 Eli Zaretskii <address@hidden>
+
+ * dispnew.c (sit_for, Fsleep_for):
+ * keyboard.c (kbd_buffer_get_event):
+ * process.c (Faccept_process_output): Avoid compiler warnings when
+ comparing a 32-bit time_t with a 64-bit INTMAX_MAX.
+
2012-06-23 Juanma Barranquero <address@hidden>
* makefile.w32-in: Update dependencies.
=== modified file 'src/dispnew.c'
--- a/src/dispnew.c 2012-06-22 21:17:42 +0000
+++ b/src/dispnew.c 2012-06-23 19:40:50 +0000
@@ -5957,7 +5957,9 @@
if (0 < duration)
{
EMACS_TIME t = EMACS_TIME_FROM_DOUBLE (duration);
- wait_reading_process_output (min (EMACS_SECS (t), INTMAX_MAX),
+ intmax_t secs = EMACS_SECS (t);
+
+ wait_reading_process_output (min (secs, INTMAX_MAX),
EMACS_NSECS (t), 0, 0, Qnil, NULL, 0);
}
@@ -6005,7 +6007,8 @@
else
{
EMACS_TIME t = EMACS_TIME_FROM_DOUBLE (seconds);
- sec = min (EMACS_SECS (t), INTMAX_MAX);
+ sec = EMACS_SECS (t);
+ sec = min (sec, INTMAX_MAX);
nsec = EMACS_NSECS (t);
}
}
=== modified file 'src/keyboard.c'
--- a/src/keyboard.c 2012-06-23 12:39:23 +0000
+++ b/src/keyboard.c 2012-06-23 19:40:50 +0000
@@ -3857,9 +3857,11 @@
return Qnil; /* finished waiting */
else
{
+ intmax_t secs;
+
EMACS_SUB_TIME (duration, *end_time, duration);
- wait_reading_process_output (min (EMACS_SECS (duration),
- INTMAX_MAX),
+ secs = EMACS_SECS (duration);
+ wait_reading_process_output (min (secs, INTMAX_MAX),
EMACS_NSECS (duration),
-1, 1, Qnil, NULL, 0);
}
=== modified file 'src/process.c'
--- a/src/process.c 2012-06-22 21:17:42 +0000
+++ b/src/process.c 2012-06-23 19:40:50 +0000
@@ -3996,7 +3996,9 @@
if (0 < XFLOAT_DATA (seconds))
{
EMACS_TIME t = EMACS_TIME_FROM_DOUBLE (XFLOAT_DATA (seconds));
- secs = min (EMACS_SECS (t), INTMAX_MAX);
+
+ secs = EMACS_SECS (t);
+ secs = min (secs, INTMAX_MAX);
nsecs = EMACS_NSECS (t);
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r108713: Avoid compiler warnings in comparing time_t.,
Eli Zaretskii <=