From patchwork Sat Nov 29 06:32:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos O'Donell X-Patchwork-Id: 4002 Received: (qmail 1127 invoked by alias); 29 Nov 2014 06:32:17 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 1118 invoked by uid 89); 29 Nov 2014 06:32:16 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Message-ID: <5479686D.1030001@redhat.com> Date: Sat, 29 Nov 2014 01:32:13 -0500 From: "Carlos O'Donell" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: GNU C Library Subject: [COMMITTED] bits/ioctl-types.h: Indent cpp directives correctly. This file has the wrong indenting for preprocessor directives. I couldn't find any other file that might match this file that could argue for keeping the odd lack of indentation to ease diffing and updating. 2014-11-29 Carlos O'Donell * bits/ioctl-types.h: Indent preprocessor directives correctly. --- Cheers, Carlos. 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