about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2012-11-01 09:14:30 +0100
committerThomas Schwinge <thomas@codesourcery.com>2012-11-01 09:18:13 +0100
commit4078da3d4ed94e148986b50f4fbaf9cca87fc52c (patch)
tree35f06af44f2df5adc7bdf5a611d90b89338d0346
parent53176cd906c7902dfcbbe2086384433c6c65a12d (diff)
downloadglibc-4078da3d4ed94e148986b50f4fbaf9cca87fc52c.tar.gz
glibc-4078da3d4ed94e148986b50f4fbaf9cca87fc52c.tar.xz
glibc-4078da3d4ed94e148986b50f4fbaf9cca87fc52c.zip
Fix a compilation error in the Hurd's bits/param.h.
Introduced in the unification in commit
e66a42f57fd20d1c7bbdc5f7937831d13bcf709b.
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/mach/hurd/bits/param.h2
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c1fbbe2121..b205a57876 100644
--- a/ChangeLog
+++ b/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 a/sysdeps/mach/hurd/bits/param.h b/sysdeps/mach/hurd/bits/param.h
index d52c1edcb6..2f53f686df 100644
--- a/sysdeps/mach/hurd/bits/param.h
+++ b/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 */