diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | bits/ioctl-types.h | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 5c49d7dc72..35de0ab843 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 288f38c860..db84748c7a 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 |