This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.13-112-gd080554
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 7 May 2011 13:14:06 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.13-112-gd080554
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via d08055417d0187875806161fab8c4777adfb7ba8 (commit)
via 8a35c9120fedda4d5cce1d37783e1f8bf6fc58da (commit)
from acd41f47eae558eb35871de3af7114c43093ff99 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d08055417d0187875806161fab8c4777adfb7ba8
commit d08055417d0187875806161fab8c4777adfb7ba8
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sat May 7 09:13:43 2011 -0400
Misplaced new line in last patch
diff --git a/sysdeps/unix/sysv/linux/sys/sysmacros.h b/sysdeps/unix/sysv/linux/sys/sysmacros.h
index 92501d4..3fc01df 100644
--- a/sysdeps/unix/sysv/linux/sys/sysmacros.h
+++ b/sysdeps/unix/sysv/linux/sys/sysmacros.h
@@ -60,10 +60,8 @@ __NTH (gnu_dev_makedev (unsigned int __major, unsigned int __minor))
| (((unsigned long long int) (__minor & ~0xff)) << 12)
| (((unsigned long long int) (__major & ~0xfff)) << 32));
}
-
-__END_DECLS
# endif
-
+__END_DECLS
/* Access the functions with their traditional names. */
# define major(dev) gnu_dev_major (dev)
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=8a35c9120fedda4d5cce1d37783e1f8bf6fc58da
commit 8a35c9120fedda4d5cce1d37783e1f8bf6fc58da
Author: Paul Pluzhnikov <ppluzhnikov@google.com>
Date: Sat May 7 09:03:36 2011 -0400
Add missing {__BEGIN,__END}_DECLS to sys/sysmacros.h
diff --git a/ChangeLog b/ChangeLog
index 83c0f9b..d7bb734 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-06 Paul Pluzhnikov <ppluzhnikov@google.com>
+
+ * sysdeps/unix/sysv/linux/sys/sysmacros.h: Add missing
+ __BEGIN/__END_DECLS.
+
2011-05-06 Ulrich Drepper <drepper@gmail.com>
* nss/nss_files/files-initgroups.c (_nss_files_initgroups_dyn): Return
diff --git a/sysdeps/unix/sysv/linux/sys/sysmacros.h b/sysdeps/unix/sysv/linux/sys/sysmacros.h
index 92b3a19..92501d4 100644
--- a/sysdeps/unix/sysv/linux/sys/sysmacros.h
+++ b/sysdeps/unix/sysv/linux/sys/sysmacros.h
@@ -1,5 +1,5 @@
/* Definitions of macros to access `dev_t' values.
- Copyright (C) 1996, 1997, 1999, 2003, 2004, 2007
+ Copyright (C) 1996, 1997, 1999, 2003, 2004, 2007, 2011
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -27,6 +27,8 @@
not going to hack weird hacks to support the dev_t representation
they need. */
#ifdef __GLIBC_HAVE_LONG_LONG
+__BEGIN_DECLS
+
__extension__
extern unsigned int gnu_dev_major (unsigned long long int __dev)
__THROW;
@@ -58,6 +60,8 @@ __NTH (gnu_dev_makedev (unsigned int __major, unsigned int __minor))
| (((unsigned long long int) (__minor & ~0xff)) << 12)
| (((unsigned long long int) (__major & ~0xfff)) << 32));
}
+
+__END_DECLS
# endif
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
sysdeps/unix/sysv/linux/sys/sysmacros.h | 6 ++++--
2 files changed, 9 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources