diff options
| author | Paul Eggert <[email protected]> | 2013-09-24 20:44:34 -0700 |
|---|---|---|
| committer | Paul Eggert <[email protected]> | 2013-09-24 20:44:34 -0700 |
| commit | 959c3d24a7ba87716891affbc2c7720e9f020ac6 (patch) | |
| tree | 110edd830e219e40398bb9a45768e6737946dbd0 /lib | |
| parent | 0c1738785d65e807e9500f6a1200baba66edc80c (diff) | |
Merge from gnulib.
This incorporates:
2013-09-24 manywarnings: enable nicer gcc warning messages
2013-09-23 warnings: port --enable-gcc-warnings to Solaris Studio 12.3
2013-09-21 timespec: use the new TIMESPEC_RESOLUTION elsewhere
* configure.ac (WERROR_CFLAGS): Omit -fdiagnostics-show-option
and -funit-at-a-time, since manywarnings does that for us now.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/timespec-add.c | 4 | ||||
| -rw-r--r-- | lib/timespec-sub.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/timespec-add.c b/lib/timespec-add.c index 51323a6320..d628237fe5 100644 --- a/lib/timespec-add.c +++ b/lib/timespec-add.c @@ -18,7 +18,7 @@ /* Written by Paul Eggert. */ /* Return the sum of two timespec values A and B. On overflow, return - an extremal value. This assumes 0 <= tv_nsec <= 999999999. */ + an extremal value. This assumes 0 <= tv_nsec < TIMESPEC_RESOLUTION. */ #include <config.h> #include "timespec.h" @@ -58,7 +58,7 @@ timespec_add (struct timespec a, struct timespec b) { high_overflow: rs = TYPE_MAXIMUM (time_t); - rns = 999999999; + rns = TIMESPEC_RESOLUTION - 1; } } else diff --git a/lib/timespec-sub.c b/lib/timespec-sub.c index b164a8380d..3f3adea28d 100644 --- a/lib/timespec-sub.c +++ b/lib/timespec-sub.c @@ -18,8 +18,8 @@ /* Written by Paul Eggert. */ /* Return the difference between two timespec values A and B. On - overflow, return an extremal value. This assumes 0 <= tv_nsec <= - 999999999. */ + overflow, return an extremal value. This assumes 0 <= tv_nsec < + TIMESPEC_RESOLUTION. */ #include <config.h> #include "timespec.h" @@ -58,7 +58,7 @@ timespec_sub (struct timespec a, struct timespec b) else { rs = TYPE_MAXIMUM (time_t); - rns = 999999999; + rns = TIMESPEC_RESOLUTION - 1; } } else |