summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog6
-rw-r--r--nptl/sysdeps/pthread/pthread.h4
-rw-r--r--nptl/sysdeps/unix/sysv/linux/internaltypes.h2
-rw-r--r--nptl/tst-cancel4.c2
4 files changed, 10 insertions, 4 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index a047c2347f..d1efbb43e5 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2013-08-30   Ondřej Bílka  <neleai@seznam.cz>
+
+	* sysdeps/pthread/pthread.h: Fix typos.
+	* sysdeps/unix/sysv/linux/internaltypes.h: Likewise.
+	* tst-cancel4.c: Likewise.
+
 2013-08-21   Ondřej Bílka  <neleai@seznam.cz>
 
 	* pthread_getschedparam.c: Fix typos.
diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h
index 61d534687f..b58f60e4dd 100644
--- a/nptl/sysdeps/pthread/pthread.h
+++ b/nptl/sysdeps/pthread/pthread.h
@@ -1034,13 +1034,13 @@ extern int pthread_condattr_setpshared (pthread_condattr_t *__attr,
 					int __pshared) __THROW __nonnull ((1));
 
 #ifdef __USE_XOPEN2K
-/* Get the clock selected for the conditon variable attribute ATTR.  */
+/* Get the clock selected for the condition variable attribute ATTR.  */
 extern int pthread_condattr_getclock (const pthread_condattr_t *
 				      __restrict __attr,
 				      __clockid_t *__restrict __clock_id)
      __THROW __nonnull ((1, 2));
 
-/* Set the clock selected for the conditon variable attribute ATTR.  */
+/* Set the clock selected for the condition variable attribute ATTR.  */
 extern int pthread_condattr_setclock (pthread_condattr_t *__attr,
 				      __clockid_t __clock_id)
      __THROW __nonnull ((1));
diff --git a/nptl/sysdeps/unix/sysv/linux/internaltypes.h b/nptl/sysdeps/unix/sysv/linux/internaltypes.h
index 699a6187cb..a7ee3fefe1 100644
--- a/nptl/sysdeps/unix/sysv/linux/internaltypes.h
+++ b/nptl/sysdeps/unix/sysv/linux/internaltypes.h
@@ -66,7 +66,7 @@ struct pthread_condattr
 {
   /* Combination of values:
 
-     Bit 0  : flag whether coditional variable will be shareable between
+     Bit 0  : flag whether conditional variable will be sharable between
 	      processes.
 
      Bit 1-7: clock ID.  */
diff --git a/nptl/tst-cancel4.c b/nptl/tst-cancel4.c
index 6d25e48f1c..6ef654a40b 100644
--- a/nptl/tst-cancel4.c
+++ b/nptl/tst-cancel4.c
@@ -83,7 +83,7 @@ static pthread_barrier_t b2;
 # define IPC_ADDVAL 0
 #endif
 
-/* The WRITE_BUFFER_SIZE value needs to be choosen such that if we set
+/* The WRITE_BUFFER_SIZE value needs to be chosen such that if we set
    the socket send buffer size to '1', a write of this size on that
    socket will block.