Re: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-214-ge66a42f

[Thomas Schwinge <thomas at codesourcery dot com>]

Hi!

On 17 Aug 2012 17:36:03 -0000, roland@sourceware.org wrote:
> http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=e66a42f57fd20d1c7bbdc5f7937831d13bcf709b
> 
> commit e66a42f57fd20d1c7bbdc5f7937831d13bcf709b
> Author: Roland McGrath <roland@hack.frob.com>
> Date:   Fri Aug 17 09:55:17 2012 -0700
> 
>     Split sys/param.h out into common file and sysdeps bits/param.h file.

> +	* bits/param.h: New file.
> +	* misc/sys/param.h: New file.
> +	* include/sys/param.h: New file.
> +	* misc/Makefile (headers): Add bits/param.h.
> +	* sysdeps/generic/sys/param.h: File removed.
> +	* sysdeps/unix/sysv/linux/bits/param.h: New file.
> +	* sysdeps/unix/sysv/linux/sys/param.h: File removed.
> +	* sysdeps/mach/hurd/bits/param.h: New file.
> +	* sysdeps/mach/hurd/sys/param.h: New file.

    In file included from ../misc/sys/param.h:31:0,
                     from ../include/sys/param.h:1,
                     from ../libio/libioP.h:717,
                     from fopenport.c:84:
    ../sysdeps/mach/hurd/bits/param.h: At top level:
    ../sysdeps/mach/hurd/bits/param.h:87:2: error: #endif without #if
     #endif  /* sys/param.h */
      ^

None of the bits/param.h files does have multi-inclusion guards, so I
removed this remnant, too (and fixed the copy'n'past-o in the ChangeLog);
pushed to master:

commit 4078da3d4ed94e148986b50f4fbaf9cca87fc52c
Author: Thomas Schwinge <thomas@codesourcery.com>
Date:   Thu Nov 1 09:14:30 2012 +0100

    Fix a compilation error in the Hurd's bits/param.h.
    
    Introduced in the unification in commit
    e66a42f57fd20d1c7bbdc5f7937831d13bcf709b.

diff --git ChangeLog ChangeLog
index c1fbbe2..b205a57 100644
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,7 @@
+2012-11-01  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* sysdeps/mach/hurd/bits/param.h: Remove stray #endif.
+
 2012-10-31  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/sh/Makefile [$(subdir) = debug] (CFLAGS-backtrace.c):
@@ -2518,7 +2522,7 @@
 	* sysdeps/unix/sysv/linux/bits/param.h: New file.
 	* sysdeps/unix/sysv/linux/sys/param.h: File removed.
 	* sysdeps/mach/hurd/bits/param.h: New file.
-	* sysdeps/mach/hurd/sys/param.h: New file.
+	* sysdeps/mach/hurd/sys/param.h: File removed.
 
 	* elf/dl-close.c (_dl_close_worker): Add a cast and a comment to the
 	last change.
diff --git sysdeps/mach/hurd/bits/param.h sysdeps/mach/hurd/bits/param.h
index d52c1ed..2f53f68 100644
--- sysdeps/mach/hurd/bits/param.h
+++ sysdeps/mach/hurd/bits/param.h
@@ -83,5 +83,3 @@
 
 #define	FSHIFT	11		/* Bits to right of fixed binary point.  */
 #define FSCALE	(1<<FSHIFT)
-
-#endif	 /* sys/param.h */


GrÃÃe,
 Thomas

Attachment: pgp00000.pgp
Description: PGP signature