This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.23-265-ged3c787


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  ed3c7876ccf1188b4500e3c3a5f420b700f9e822 (commit)
      from  e01eef67baf2caa155b1d7ff5e0c191fd0fd4828 (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=ed3c7876ccf1188b4500e3c3a5f420b700f9e822

commit ed3c7876ccf1188b4500e3c3a5f420b700f9e822
Author: Florian Weimer <fweimer@redhat.com>
Date:   Thu Apr 28 16:53:56 2016 +0200

    resolv: Reindent preprocessor conditionals following cleanups

diff --git a/ChangeLog b/ChangeLog
index 8c1de33..bb2ca73 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 10d9a1e..022f7ea 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 915a70a..cea4c8a 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 9a11d16..12f9730 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.

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

Summary of changes:
 ChangeLog            |    6 ++++++
 resolv/inet_addr.c   |   10 +++++-----
 resolv/res_init.c    |    4 ++--
 resolv/res_mkquery.c |   10 +++++-----
 4 files changed, 18 insertions(+), 12 deletions(-)


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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]