From: Roy Marples Date: Wed, 16 Jan 2008 13:16:11 +0000 (+0000) Subject: uptime should return time_t X-Git-Tag: v3.2.3~91 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=398ac8be8acb725f655ab0ed6e9f916bb6e83e5a;p=thirdparty%2Fdhcpcd.git uptime should return time_t --- diff --git a/common.c b/common.c index e07b26f0..747e4f0e 100644 --- a/common.c +++ b/common.c @@ -167,7 +167,7 @@ int get_time (struct timeval *tp) #endif } -long uptime (void) +time_t uptime (void) { struct timeval tp; diff --git a/common.h b/common.h index ff97e035..3dbae4b8 100644 --- a/common.h +++ b/common.h @@ -51,7 +51,7 @@ void srandomdev (void); void close_fds (void); char *getline (FILE *fp); int get_time (struct timeval *tp); -long uptime (void); +time_t uptime (void); void writepid (int fd, pid_t pid); void *xrealloc (void *ptr, size_t size); void *xmalloc (size_t size); diff --git a/dhcp.h b/dhcp.h index fc75fd4c..48dc7cc9 100644 --- a/dhcp.h +++ b/dhcp.h @@ -167,8 +167,6 @@ typedef struct dhcp_t bool frominfo; } dhcp_t; - - /* Sizes for DHCP options */ #define DHCP_CHADDR_LEN 16 #define SERVERNAME_LEN 64