recent checkin broke the Emacs build

recent checkin broke the Emacs build

[Eric Hanchrow]

This is on Ubuntu "Intrepid".

commit d80294aec20a5c4f8313c641e1862601e7799ef4
Author: Glenn Morris <rgm@gnu.org>
Date:   Wed Feb 11 03:59:52 2009 +0000

   (mbx_delimit_begin): Also write the current time.

 2 files changed, 16 insertions(+), 1 deletions(-)
boot=bootstrap-emacs;                         \
       if [ -x "src/$boot" ]; then boot=""; fi;                   \
       cd lib-src; make all                            \
         CC='gcc' CFLAGS='-g -O2 -Wno-pointer-sign '
CPPFLAGS='-D_BSD_SOURCE  ' \
         LDFLAGS='-Wl,-znocombreloc ' MAKE='make' BOOTSTRAPEMACS="$boot"
make[1]: Entering directory `/usr/local/src/emacs/lib-src'
gcc -c -D_BSD_SOURCE -DHAVE_CONFIG_H -I. -I../src
-I/usr/local/src/emacs/lib-src -I/usr/local/src/emacs/lib-src/../src
-D_BSD_SOURCE   -g -O2 -Wno-pointer-sign  -Demacs
/usr/local/src/emacs/lib-src/movemail.c
/usr/local/src/emacs/lib-src/movemail.c: In function 'main':
/usr/local/src/emacs/lib-src/movemail.c:326: warning: ignoring return
value of 'mktemp', declared with attribute warn_unused_result
/usr/local/src/emacs/lib-src/movemail.c: In function 'error':
/usr/local/src/emacs/lib-src/movemail.c:624: warning: format not a
string literal and no format arguments
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
/usr/local/src/emacs/lib-src/movemail.c: In function 'popmail':
/usr/local/src/emacs/lib-src/movemail.c:762: warning: ignoring return
value of 'fchown', declared with attribute warn_unused_result
make[1]: *** [movemail.o] Error 1
make[1]: Leaving directory `/usr/local/src/emacs/lib-src'
make: *** [lib-src] Error 2

Re: recent checkin broke the Emacs build

[Sven Joachim]

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  <svenjoac@gmx.de>

	* movemail.c (main): Include time.h unconditionally.

Re: recent checkin broke the Emacs build

[Tassilo Horn]

Sven Joachim <svenjoac@gmx.de> writes:

Hi Sven,

> 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:
>
> --- 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
>
> Suggested Changelog entry:
>
> 2009-02-12  Sven Joachim  <svenjoac@gmx.de>
>
> 	* movemail.c (main): Include time.h unconditionally.

I suffered from the error before and your patch works fine for me.  Is
there any reason not to check it in?

Bye,
Tassilo

Re: recent checkin broke the Emacs build

[Sven Joachim]

On 2009-02-13 08:25 +0100, Tassilo Horn wrote:

> I suffered from the error before and your patch works fine for me.  Is
> there any reason not to check it in?

It requires somebody with write access.

Sven

Re: recent checkin broke the Emacs build

[Tassilo Horn]

Sven Joachim <svenjoac@gmx.de> writes:

Hi Sven,

>> I suffered from the error before and your patch works fine for me.
>> Is there any reason not to check it in?
>
> It requires somebody with write access.

Yes, it was a rhetorical question and meant "Someone commit it,
please!".  I didn't want to do it myself, cause I don't know if it's
TRT.

Bye,
Tassilo

Re: recent checkin broke the Emacs build

[Chong Yidong]

Sven Joachim <svenjoac@gmx.de> writes:

> Here is a patch for this:

Applied, thanks.