GNU C Library master sources branch master updated. glibc-2.20-279-gc8dc172

[carlos at sourceware dot org]

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  c8dc17276792c6dd88a5efa84e7ff01bb08a6367 (commit)
      from  6d03458e40bdb08d99d05bc7b298b00ad77d8e2b (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c8dc17276792c6dd88a5efa84e7ff01bb08a6367

commit c8dc17276792c6dd88a5efa84e7ff01bb08a6367
Author: Carlos O'Donell <carlos@redhat.com>
Date:   Sat Nov 29 01:30:51 2014 -0500

    Fix indenting in bits/ioctl-types.h.
    
    Indent the preprocessor directives correctly according
    to the normal glibc style.

diff --git a/ChangeLog b/ChangeLog
index 5c49d7d..35de0ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2014-11-29  Carlos O'Donell  <carlos@redhat.com>
 
+	* bits/ioctl-types.h: Indent preprocessor directives correctly.
+
 	* nptl/nptl-init.c: Include libc-internal.h.
 	(__pthread_initialize_minimal_internal): Use ROUND_UP.
 
diff --git a/bits/ioctl-types.h b/bits/ioctl-types.h
index 288f38c..db84748 100644
--- a/bits/ioctl-types.h
+++ b/bits/ioctl-types.h
@@ -32,7 +32,7 @@ struct tchars
   char t_brkc;			/* Input delimiter character.  */
 };
 
-#define	_IOT_tchars	/* Hurd ioctl type field.  */ \
+# define	_IOT_tchars	/* Hurd ioctl type field.  */ \
   _IOT (_IOTS (char), 6, 0, 0, 0, 0)
 #endif
 
@@ -48,7 +48,7 @@ struct ltchars
   char t_lnextc;		/* Literal-next character.  */
 };
 
-#define	_IOT_ltchars	/* Hurd ioctl type field.  */ \
+# define	_IOT_ltchars	/* Hurd ioctl type field.  */ \
   _IOT (_IOTS (char), 6, 0, 0, 0, 0)
 #endif
 
@@ -77,7 +77,7 @@ struct winsize
   unsigned short int ws_ypixel;	/* Vertical pixels.  */
 };
 
-#define	_IOT_winsize	/* Hurd ioctl type field.  */ \
+# define	_IOT_winsize	/* Hurd ioctl type field.  */ \
   _IOT (_IOTS (unsigned short int), 4, 0, 0, 0, 0)
 #endif
 
@@ -86,8 +86,8 @@ struct winsize
    in a preprocessor conditional.  Since the commands are always unique
    regardless of the size bits, we can safely define away `sizeof' for the
    purpose of the conditional.  */
-#  define sizeof(type) 0
-#  if defined TIOCGWINSZ && TIOCGSIZE == TIOCGWINSZ
+# define sizeof(type) 0
+# if defined TIOCGWINSZ && TIOCGSIZE == TIOCGWINSZ
 /* Many systems that have TIOCGWINSZ define TIOCGSIZE for source
    compatibility with Sun; they define `struct ttysize' to have identical
    layout as `struct winsize' and #define TIOCGSIZE to be TIOCGWINSZ
@@ -99,8 +99,8 @@ struct ttysize
   unsigned short int ts_xxx;
   unsigned short int ts_yyy;
 };
-#define	_IOT_ttysize	_IOT_winsize
-#  else
+#  define	_IOT_ttysize	_IOT_winsize
+# else
 /* Suns use a different layout for `struct ttysize', and TIOCGSIZE and
    TIOCGWINSZ are separate commands that do the same thing with different
    structures (likewise TIOCSSIZE and TIOCSWINSZ).  */
@@ -108,6 +108,6 @@ struct ttysize
 {
   int ts_lines, ts_cols;	/* Lines and columns, in characters.  */
 };
-#  endif
-#  undef sizeof			/* See above.  */
+# endif
+# undef sizeof			/* See above.  */
 #endif

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |    2 ++
 bits/ioctl-types.h |   18 +++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources