about summary refs log tree commit diff
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos@systemhalted.org>2012-10-10 23:28:52 -0400
committerCarlos O'Donell <carlos@systemhalted.org>2012-10-10 23:28:52 -0400
commit0d522f6417d91eded2bb771a0cf08cb22e4dbb98 (patch)
tree91ece1e4c9946115d6ec2618b336390351f7c712
parent9d9358f2ebf5dd45c185b1f4d2937325ba721931 (diff)
downloadglibc-0d522f6417d91eded2bb771a0cf08cb22e4dbb98.tar.gz
glibc-0d522f6417d91eded2bb771a0cf08cb22e4dbb98.tar.xz
glibc-0d522f6417d91eded2bb771a0cf08cb22e4dbb98.zip
Fix formatting in nptl/sysdeps/pthread/pthread.h.
The macro pthread_cleanup_push_defer_np in pthread.h has a misaligned
line continuation marker. This marker was previously aligned, but
recent changes have moved it out of alignment. This change realigns
the marker. This also reduces the diff against the hppa version of
pthread.h where the marker is aligned.
-rw-r--r--nptl/ChangeLog4
-rw-r--r--nptl/sysdeps/pthread/pthread.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 01ad0b97d6..6faf528bc5 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-10  Carlos O'Donell  <carlos@systemhalted.org>
+
+	* sysdeps/pthread/pthread.h: Fix formatting.
+
 2012-10-10  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
 	[BZ #14652]
diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h
index 00cc7e8543..139be05ba8 100644
--- a/nptl/sysdeps/pthread/pthread.h
+++ b/nptl/sysdeps/pthread/pthread.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -694,7 +694,7 @@ extern void __pthread_unregister_cancel (__pthread_unwind_buf_t *__buf)
     void *__cancel_arg = (arg);						      \
     int __not_first_call = __sigsetjmp ((struct __jmp_buf_tag *) (void *)     \
 					__cancel_buf.__cancel_jmp_buf, 0);    \
-    if (__glibc_unlikely (__not_first_call))			      \
+    if (__glibc_unlikely (__not_first_call))				      \
       {									      \
 	__cancel_routine (__cancel_arg);				      \
 	__pthread_unwind_next (&__cancel_buf);				      \