[hurd,commited,1/6] hurd: Fix preprocessor indentation

Message ID 20180129220048.28097-2-samuel.thibault@ens-lyon.org
State New
Headers show
Series
  • hurd: fixes against previous hurd commits
Related show

Commit Message

Samuel Thibault Jan. 29, 2018, 10 p.m.
---
 hurd/hurd/fd.h        |  8 ++++----
 hurd/hurd/port.h      | 24 ++++++++++++------------
 hurd/hurd/signal.h    | 18 +++++++++---------
 hurd/hurd/threadvar.h |  8 ++++----
 hurd/hurd/userlink.h  | 12 ++++++------
 5 files changed, 35 insertions(+), 35 deletions(-)

-- 
2.15.1

Patch

diff --git a/hurd/hurd/fd.h b/hurd/hurd/fd.h
index f43dec508a..22dc944dce 100644
--- a/hurd/hurd/fd.h
+++ b/hurd/hurd/fd.h
@@ -62,7 +62,7 @@  extern struct mutex _hurd_dtable_lock; /* Locks those two variables.  */
 extern struct hurd_fd *_hurd_fd_get (int fd);
 
 #if defined __USE_EXTERN_INLINES && defined _LIBC
-#  if IS_IN (libc)
+# if IS_IN (libc)
 _HURD_FD_H_EXTERN_INLINE struct hurd_fd *
 _hurd_fd_get (int fd)
 {
@@ -95,7 +95,7 @@  _hurd_fd_get (int fd)
 
   return descriptor;
 }
-#  endif
+# endif
 #endif
 
 
@@ -281,7 +281,7 @@  extern int _hurd_select (int nfds, struct pollfd *pollfds,
    __hurd_file_name_lookup.  */
 
 #if defined __USE_EXTERN_INLINES && defined _LIBC
-#  if IS_IN (libc)
+# if IS_IN (libc)
 _HURD_FD_H_EXTERN_INLINE error_t
 __hurd_at_flags (int *at_flags, int *flags)
 {
@@ -298,7 +298,7 @@  __hurd_at_flags (int *at_flags, int *flags)
 
   return 0;
 }
-#  endif
+# endif
 #endif
 
 /* Variant of file_name_lookup used in *at function implementations.
diff --git a/hurd/hurd/port.h b/hurd/hurd/port.h
index f1da86951d..eec85ccc29 100644
--- a/hurd/hurd/port.h
+++ b/hurd/hurd/port.h
@@ -63,7 +63,7 @@  struct hurd_port
 extern void _hurd_port_init (struct hurd_port *port, mach_port_t init);
 
 #if defined __USE_EXTERN_INLINES && defined _LIBC
-#  if IS_IN (libc)
+# if IS_IN (libc)
 _HURD_PORT_H_EXTERN_INLINE void
 _hurd_port_init (struct hurd_port *port, mach_port_t init)
 {
@@ -71,7 +71,7 @@  _hurd_port_init (struct hurd_port *port, mach_port_t init)
   port->users = NULL;
   port->port = init;
 }
-#  endif
+# endif
 #endif
 
 
@@ -86,7 +86,7 @@  _hurd_port_locked_get (struct hurd_port *port,
 		       struct hurd_userlink *link);
 
 #if defined __USE_EXTERN_INLINES && defined _LIBC
-#  if IS_IN (libc)
+# if IS_IN (libc)
 _HURD_PORT_H_EXTERN_INLINE mach_port_t
 _hurd_port_locked_get (struct hurd_port *port,
 		       struct hurd_userlink *link)
@@ -102,7 +102,7 @@  _hurd_port_locked_get (struct hurd_port *port,
   __spin_unlock (&port->lock);
   return result;
 }
-#  endif
+# endif
 #endif
 
 /* Same, but locks PORT first.  */
@@ -112,7 +112,7 @@  _hurd_port_get (struct hurd_port *port,
 		struct hurd_userlink *link);
 
 #if defined __USE_EXTERN_INLINES && defined _LIBC
-#  if IS_IN (libc)
+# if IS_IN (libc)
 _HURD_PORT_H_EXTERN_INLINE mach_port_t
 _hurd_port_get (struct hurd_port *port,
 		struct hurd_userlink *link)
@@ -124,7 +124,7 @@  _hurd_port_get (struct hurd_port *port,
   HURD_CRITICAL_END;
   return result;
 }
-#  endif
+# endif
 #endif
 
 
@@ -136,7 +136,7 @@  _hurd_port_free (struct hurd_port *port,
 		 mach_port_t used_port);
 
 #if defined __USE_EXTERN_INLINES && defined _LIBC
-#  if IS_IN (libc)
+# if IS_IN (libc)
 _HURD_PORT_H_EXTERN_INLINE void
 _hurd_port_free (struct hurd_port *port,
 		 struct hurd_userlink *link,
@@ -156,7 +156,7 @@  _hurd_port_free (struct hurd_port *port,
   if (dealloc)
     __mach_port_deallocate (__mach_task_self (), used_port);
 }
-#  endif
+# endif
 #endif
 
 
@@ -166,7 +166,7 @@  _hurd_port_free (struct hurd_port *port,
 extern void _hurd_port_locked_set (struct hurd_port *port, mach_port_t newport);
 
 #if defined __USE_EXTERN_INLINES && defined _LIBC
-#  if IS_IN (libc)
+# if IS_IN (libc)
 _HURD_PORT_H_EXTERN_INLINE void
 _hurd_port_locked_set (struct hurd_port *port, mach_port_t newport)
 {
@@ -177,7 +177,7 @@  _hurd_port_locked_set (struct hurd_port *port, mach_port_t newport)
   if (old != MACH_PORT_NULL)
     __mach_port_deallocate (__mach_task_self (), old);
 }
-#  endif
+# endif
 #endif
 
 /* Same, but locks PORT first.  */
@@ -185,7 +185,7 @@  _hurd_port_locked_set (struct hurd_port *port, mach_port_t newport)
 extern void _hurd_port_set (struct hurd_port *port, mach_port_t newport);
 
 #if defined __USE_EXTERN_INLINES && defined _LIBC
-#  if IS_IN (libc)
+# if IS_IN (libc)
 _HURD_PORT_H_EXTERN_INLINE void
 _hurd_port_set (struct hurd_port *port, mach_port_t newport)
 {
@@ -194,7 +194,7 @@  _hurd_port_set (struct hurd_port *port, mach_port_t newport)
   _hurd_port_locked_set (port, newport);
   HURD_CRITICAL_END;
 }
-#  endif
+# endif
 #endif
 
 
diff --git a/hurd/hurd/signal.h b/hurd/hurd/signal.h
index 5ee95acd09..53234724a4 100644
--- a/hurd/hurd/signal.h
+++ b/hurd/hurd/signal.h
@@ -43,9 +43,9 @@ 
 #include <hurd/threadvar.h>	/* We cache sigstate in a threadvar.  */
 struct hurd_signal_preemptor;	/* <hurd/sigpreempt.h> */
 #if defined __USE_EXTERN_INLINES && defined _LIBC
-#  if IS_IN (libc) || IS_IN (libpthread)
-#    include <sigsetops.h>
-#  endif
+# if IS_IN (libc) || IS_IN (libpthread)
+#  include <sigsetops.h>
+# endif
 #endif
 
 
@@ -135,7 +135,7 @@  extern struct hurd_sigstate *_hurd_self_sigstate (void)
 #endif
 
 #if defined __USE_EXTERN_INLINES && defined _LIBC
-#  if IS_IN (libc)
+# if IS_IN (libc)
 _HURD_SIGNAL_H_EXTERN_INLINE struct hurd_sigstate *
 _hurd_self_sigstate (void)
 {
@@ -145,7 +145,7 @@  _hurd_self_sigstate (void)
     *location = _hurd_thread_sigstate (__mach_thread_self ());
   return *location;
 }
-#  endif
+# endif
 #endif
 
 /* Thread listening on our message port; also called the "signal thread".  */
@@ -176,7 +176,7 @@  extern int _hurd_core_limit;
 extern void *_hurd_critical_section_lock (void);
 
 #if defined __USE_EXTERN_INLINES && defined _LIBC
-#  if IS_IN (libc)
+# if IS_IN (libc)
 _HURD_SIGNAL_H_EXTERN_INLINE void *
 _hurd_critical_section_lock (void)
 {
@@ -201,13 +201,13 @@  _hurd_critical_section_lock (void)
      _hurd_critical_section_unlock to unlock it.  */
   return ss;
 }
-#  endif
+# endif
 #endif
 
 extern void _hurd_critical_section_unlock (void *our_lock);
 
 #if defined __USE_EXTERN_INLINES && defined _LIBC
-#  if IS_IN (libc)
+# if IS_IN (libc)
 _HURD_SIGNAL_H_EXTERN_INLINE void
 _hurd_critical_section_unlock (void *our_lock)
 {
@@ -230,7 +230,7 @@  _hurd_critical_section_unlock (void *our_lock)
 	__msg_sig_post (_hurd_msgport, 0, 0, __mach_task_self ());
     }
 }
-#  endif
+# endif
 #endif
 
 /* Convenient macros for simple uses of critical sections.
diff --git a/hurd/hurd/threadvar.h b/hurd/hurd/threadvar.h
index b5fc29da77..9b9b863dd6 100644
--- a/hurd/hurd/threadvar.h
+++ b/hurd/hurd/threadvar.h
@@ -83,7 +83,7 @@  extern unsigned long int *__hurd_threadvar_location_from_sp
   (enum __hurd_threadvar_index __index, void *__sp);
 
 #if defined __USE_EXTERN_INLINES && defined _LIBC
-#  if IS_IN (libc)
+# if IS_IN (libc)
 _HURD_THREADVAR_H_EXTERN_INLINE unsigned long int *
 __hurd_threadvar_location_from_sp (enum __hurd_threadvar_index __index,
 				   void *__sp)
@@ -95,7 +95,7 @@  __hurd_threadvar_location_from_sp (enum __hurd_threadvar_index __index,
 	   : (unsigned long int *) ((__stack & __hurd_threadvar_stack_mask) +
 				    __hurd_threadvar_stack_offset))[__index];
 }
-#  endif
+# endif
 #endif
 
 #include <machine-sp.h>		/* Define __thread_stack_pointer.  */
@@ -111,14 +111,14 @@  __hurd_threadvar_location (enum __hurd_threadvar_index __index) __THROW
      __attribute__ ((__const__));
 
 #if defined __USE_EXTERN_INLINES && defined _LIBC
-#  if IS_IN (libc)
+# if IS_IN (libc)
 _HURD_THREADVAR_H_EXTERN_INLINE unsigned long int *
 __hurd_threadvar_location (enum __hurd_threadvar_index __index)
 {
   return __hurd_threadvar_location_from_sp (__index,
 					    __thread_stack_pointer ());
 }
-#  endif
+# endif
 #endif
 
 
diff --git a/hurd/hurd/userlink.h b/hurd/hurd/userlink.h
index 66c04067a1..fb7cab27c3 100644
--- a/hurd/hurd/userlink.h
+++ b/hurd/hurd/userlink.h
@@ -81,7 +81,7 @@  _hurd_userlink_link (struct hurd_userlink **chainp,
 		     struct hurd_userlink *link);
 
 #if defined __USE_EXTERN_INLINES && defined _LIBC
-#  if IS_IN (libc)
+# if IS_IN (libc)
 _HURD_USERLINK_H_EXTERN_INLINE void
 _hurd_userlink_link (struct hurd_userlink **chainp,
 		     struct hurd_userlink *link)
@@ -102,7 +102,7 @@  _hurd_userlink_link (struct hurd_userlink **chainp,
   link->thread.prevp = thread_chainp;
   *thread_chainp = link;
 }
-#  endif
+# endif
 #endif
 
 
@@ -112,7 +112,7 @@  _hurd_userlink_link (struct hurd_userlink **chainp,
 extern int _hurd_userlink_unlink (struct hurd_userlink *link);
 
 #if defined __USE_EXTERN_INLINES && defined _LIBC
-#  if IS_IN (libc)
+# if IS_IN (libc)
 _HURD_USERLINK_H_EXTERN_INLINE int
 _hurd_userlink_unlink (struct hurd_userlink *link)
 {
@@ -135,7 +135,7 @@  _hurd_userlink_unlink (struct hurd_userlink *link)
 
   return dealloc;
 }
-#  endif
+# endif
 #endif
 
 
@@ -148,7 +148,7 @@  _hurd_userlink_unlink (struct hurd_userlink *link)
 extern int _hurd_userlink_clear (struct hurd_userlink **chainp);
 
 #if defined __USE_EXTERN_INLINES && defined _LIBC
-#  if IS_IN (libc)
+# if IS_IN (libc)
 _HURD_USERLINK_H_EXTERN_INLINE int
 _hurd_userlink_clear (struct hurd_userlink **chainp)
 {
@@ -161,7 +161,7 @@  _hurd_userlink_clear (struct hurd_userlink **chainp)
   *chainp = NULL;
   return 0;
 }
-#  endif
+# endif
 #endif
 
 #endif	/* hurd/userlink.h */