From: Florian Weimer <fweimer@redhat.com>
Date: Thu, 28 Apr 2016 14:53:56 +0000 (+0200)
Subject: resolv: Reindent preprocessor conditionals following cleanups
X-Git-Tag: glibc-2.24~313
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed3c7876ccf1188b4500e3c3a5f420b700f9e822;p=thirdparty%2Fglibc.git

resolv: Reindent preprocessor conditionals following cleanups
---

diff --git a/ChangeLog b/ChangeLog
index 8c1de339889..bb2ca735544 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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
diff --git a/resolv/inet_addr.c b/resolv/inet_addr.c
index 10d9a1e24d0..022f7ea0841 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 915a70aef39..cea4c8a3cc5 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 9a11d169a3b..12f9730199f 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.