[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: recent checkin broke the Emacs build
From: |
Sven Joachim |
Subject: |
Re: recent checkin broke the Emacs build |
Date: |
Thu, 12 Feb 2009 09:33:07 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.0.90 (gnu/linux) |
On 2009-02-12 05:42 +0100, Eric Hanchrow wrote:
> In file included from /usr/local/src/emacs/lib-src/movemail.c:687:
> /usr/include/time.h: At top level:
> /usr/include/time.h:187: error: conflicting types for 'time'
> /usr/local/src/emacs/lib-src/movemail.c:362: error: previous implicit
> declaration of 'time' was here
Here is a patch for this:
--8<---------------cut here---------------start------------->8---
--- movemail.c.~1.99.~ 2009-02-12 09:07:07.000000000 +0100
+++ movemail.c 2009-02-12 09:25:41.000000000 +0100
@@ -60,6 +60,7 @@
#include <sys/file.h>
#include <stdio.h>
#include <errno.h>
+#include <time.h>
#include <getopt.h>
#ifdef HAVE_UNISTD_H
@@ -375,7 +376,7 @@
int lockcount = 0;
int status = 0;
#if defined (MAIL_USE_MAILLOCK) && defined (HAVE_TOUCHLOCK)
- long touched_lock, now;
+ time_t touched_lock, now;
#endif
setuid (getuid ());
@@ -684,7 +685,6 @@
#endif
#include <pwd.h>
#include <string.h>
-#include <time.h>
#define NOTOK (-1)
#define OK 0
--8<---------------cut here---------------end--------------->8---
Suggested Changelog entry:
2009-02-12 Sven Joachim <address@hidden>
* movemail.c (main): Include time.h unconditionally.