diff options
| author | Florian Weimer <fweimer@redhat.com> | 2016-04-28 16:53:56 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2016-04-28 16:53:56 +0200 |
| commit | ed3c7876ccf1188b4500e3c3a5f420b700f9e822 (patch) | |
| tree | 8ff1caffe3c6455b215e1526984adde535e1b880 | |
| parent | e01eef67baf2caa155b1d7ff5e0c191fd0fd4828 (diff) | |
| download | glibc-ed3c7876ccf1188b4500e3c3a5f420b700f9e822.tar.gz glibc-ed3c7876ccf1188b4500e3c3a5f420b700f9e822.tar.xz glibc-ed3c7876ccf1188b4500e3c3a5f420b700f9e822.zip | |
resolv: Reindent preprocessor conditionals following cleanups
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | resolv/inet_addr.c | 10 | ||||
| -rw-r--r-- | resolv/res_init.c | 4 | ||||
| -rw-r--r-- | resolv/res_mkquery.c | 10 |
4 files changed, 18 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog index 8c1de33988..bb2ca73554 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2016-04-28 Florian Weimer <fweimer@redhat.com> + * resolv/inet_addr.c: Reindent preprocessor conditionals. + * resolv/res_init.c: Likewise. + * resolv/res_mkquery.c: Likewise. + +2016-04-28 Florian Weimer <fweimer@redhat.com> + * resolv/res_init.c (isascii): Do not define. Use definition in <ctype.h>. * resolv/gethnamaddr.c: Remove USE_OPTIONS_H conditional. diff --git a/resolv/inet_addr.c b/resolv/inet_addr.c index 10d9a1e24d..022f7ea084 100644 --- a/resolv/inet_addr.c +++ b/resolv/inet_addr.c @@ -72,11 +72,11 @@ #include <ctype.h> -# include <endian.h> -# include <stdint.h> -# include <stdlib.h> -# include <limits.h> -# include <errno.h> +#include <endian.h> +#include <stdint.h> +#include <stdlib.h> +#include <limits.h> +#include <errno.h> /* * Ascii internet address interpretation routine. diff --git a/resolv/res_init.c b/resolv/res_init.c index 915a70aef3..cea4c8a3cc 100644 --- a/resolv/res_init.c +++ b/resolv/res_init.c @@ -542,7 +542,7 @@ res_nclose(res_state statp) } libc_hidden_def (__res_nclose) -# ifdef _LIBC_REENTRANT +#ifdef _LIBC_REENTRANT /* This is called when a thread is exiting to free resources held in _res. */ static void __attribute__ ((section ("__libc_thread_freeres_fn"))) res_thread_freeres (void) @@ -558,4 +558,4 @@ res_thread_freeres (void) } text_set_element (__libc_thread_subfreeres, res_thread_freeres); text_set_element (__libc_subfreeres, res_thread_freeres); -# endif +#endif diff --git a/resolv/res_mkquery.c b/resolv/res_mkquery.c index 9a11d169a3..12f9730199 100644 --- a/resolv/res_mkquery.c +++ b/resolv/res_mkquery.c @@ -77,11 +77,11 @@ /* Options. Leave them on. */ /* #define DEBUG */ -# include <hp-timing.h> -# include <stdint.h> -# if HP_TIMING_AVAIL -# define RANDOM_BITS(Var) { uint64_t v64; HP_TIMING_NOW (v64); Var = v64; } -# endif +#include <hp-timing.h> +#include <stdint.h> +#if HP_TIMING_AVAIL +# define RANDOM_BITS(Var) { uint64_t v64; HP_TIMING_NOW (v64); Var = v64; } +#endif /* * Form all types of queries. |