From patchwork Mon Jan 29 22:00:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 867327 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-89806-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="BroI2hVj"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zVk5F5DvZz9s71 for ; Tue, 30 Jan 2018 09:02:25 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=xuAd0wuPSEt97nGvD9abBa1nhcMwpMV cdtm5ySPU0OYpW7rzUadWWMWbCfun/1T/xlaUu4Rr1Qy1B4OI5PYqFKmfKoDIm8l RHbaRwmbi0P/lsUHdaBxLoVJx5xG7mdFkgo9s02X1DORWd4Ub4CuSnKIKc+6zqTV t1aNlpAespFU= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=a9rrBdKem2rYEiBs9BCpixiPUVA=; b=BroI2 hVjF37KC+WJ50bLRCUjGge9JXA8M9eefzDmwYneZJulf3NJXcK8EEggYxaLfIWOz SxKMJ8XOvh0gW5xFi7FhFJtz5Bp5I3NTAtKjS/Chm4rTYkmBN5hFCBhGZuzKTLvM M6GOqMBpbSbJVOqGjBqyQygrafP/n6XTitJ4Po= Received: (qmail 50682 invoked by alias); 29 Jan 2018 22:01:57 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 50529 invoked by uid 89); 29 Jan 2018 22:01:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy= X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [hurd,commited 1/6] hurd: Fix preprocessor indentation Date: Mon, 29 Jan 2018 23:00:43 +0100 Message-Id: <20180129220048.28097-2-samuel.thibault@ens-lyon.org> In-Reply-To: <20180129220048.28097-1-samuel.thibault@ens-lyon.org> References: <20180129220048.28097-1-samuel.thibault@ens-lyon.org> --- 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(-) 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 /* We cache sigstate in a threadvar. */ struct hurd_signal_preemptor; /* */ #if defined __USE_EXTERN_INLINES && defined _LIBC -# if IS_IN (libc) || IS_IN (libpthread) -# include -# endif +# if IS_IN (libc) || IS_IN (libpthread) +# include +# 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 /* 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 */