diff options
| author | dim <dim@FreeBSD.org> | 2015-09-24 21:48:04 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-09-24 21:48:04 +0000 |
| commit | 5c80b187639f9d0f9013ea4068039582c115f9f8 (patch) | |
| tree | 1bcad8efc17a77f9140e1a6bdc016fcf18546365 /lib | |
| parent | 86e5497c676342d8d53c9f1035bc44653cab1fee (diff) | |
| parent | 47a49e1e6cd1f4b2d0c68abdf3186595a39423c1 (diff) | |
| download | FreeBSD-src-5c80b187639f9d0f9013ea4068039582c115f9f8.zip FreeBSD-src-5c80b187639f9d0f9013ea4068039582c115f9f8.tar.gz | |
Merge ^/head r288126 through r288196.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/isc/ev_timers.c | 4 | ||||
| -rw-r--r-- | lib/libmagic/config.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/libc/isc/ev_timers.c b/lib/libc/isc/ev_timers.c index 7c25c67..6d08e37 100644 --- a/lib/libc/isc/ev_timers.c +++ b/lib/libc/isc/ev_timers.c @@ -117,7 +117,7 @@ evCmpTime(struct timespec a, struct timespec b) { } struct timespec -evNowTime() { +evNowTime(void) { struct timeval now; #ifdef CLOCK_REALTIME struct timespec tsnow; @@ -136,7 +136,7 @@ evNowTime() { } struct timespec -evUTCTime() { +evUTCTime(void) { struct timeval now; #ifdef CLOCK_REALTIME struct timespec tsnow; diff --git a/lib/libmagic/config.h b/lib/libmagic/config.h index f7057d1..752b82b 100644 --- a/lib/libmagic/config.h +++ b/lib/libmagic/config.h @@ -290,7 +290,7 @@ #define PACKAGE_NAME "file" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "file 5.24" +#define PACKAGE_STRING "file 5.25" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "file" @@ -299,7 +299,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "5.24" +#define PACKAGE_VERSION "5.25" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -330,7 +330,7 @@ /* Version number of package */ -#define VERSION "5.24" +#define VERSION "5.25" /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ |
