aboutsummaryrefslogtreecommitdiff
path: root/linuxthreads
diff options
context:
space:
mode:
Diffstat (limited to 'linuxthreads')
-rw-r--r--linuxthreads/Examples/ex10.c5
-rw-r--r--linuxthreads/internals.h2
-rw-r--r--linuxthreads/pthread.c2
-rw-r--r--linuxthreads/sysdeps/unix/sysv/linux/configure3
4 files changed, 6 insertions, 6 deletions
diff --git a/linuxthreads/Examples/ex10.c b/linuxthreads/Examples/ex10.c
index eee00fa29e..f3ad517283 100644
--- a/linuxthreads/Examples/ex10.c
+++ b/linuxthreads/Examples/ex10.c
@@ -62,6 +62,7 @@ thread (void *arg)
for (;;)
{
+ int err;
clock_gettime (CLOCK_REALTIME, &ts);
@@ -72,7 +73,7 @@ thread (void *arg)
ts.tv_nsec -= 1000000000L;
}
- switch (pthread_mutex_timedlock (&mutex, &ts))
+ switch ((err = pthread_mutex_timedlock (&mutex, &ts)))
{
case 0:
flockfile (stdout);
@@ -86,6 +87,8 @@ thread (void *arg)
(unsigned long) self);
funlockfile (stdout);
continue;
+ default:
+ error (EXIT_FAILURE, err, "pthread_mutex_timedlock failure");
}
break;
}
diff --git a/linuxthreads/internals.h b/linuxthreads/internals.h
index 64fb6bb602..58a60fffc2 100644
--- a/linuxthreads/internals.h
+++ b/linuxthreads/internals.h
@@ -264,7 +264,7 @@ extern void __pthread_destroy_specifics (void);
extern void __pthread_perform_cleanup (char *currentframe);
extern void __pthread_init_max_stacksize (void);
extern int __pthread_initialize_manager (void);
-extern void __pthread_message (char * fmt, ...);
+extern void __pthread_message (const char * fmt, ...);
extern int __pthread_manager (void *reqfd);
extern int __pthread_manager_event (void *reqfd);
extern void __pthread_manager_sighandler (int sig);
diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c
index 9713fb5efd..69f7634396 100644
--- a/linuxthreads/pthread.c
+++ b/linuxthreads/pthread.c
@@ -1306,7 +1306,7 @@ __pthread_timedsuspend_new(pthread_descr self, const struct timespec *abstime)
#ifdef DEBUG
#include <stdarg.h>
-void __pthread_message(char * fmt, ...)
+void __pthread_message(const char * fmt, ...)
{
char buffer[1024];
va_list args;
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/configure b/linuxthreads/sysdeps/unix/sysv/linux/configure
deleted file mode 100644
index 229414dd74..0000000000
--- a/linuxthreads/sysdeps/unix/sysv/linux/configure
+++ /dev/null
@@ -1,3 +0,0 @@
-# Local configure fragment for sysdeps/unix/sysv/linux.
-
-DEFINES="$DEFINES -D_LIBC_REENTRANT"