diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index f9686e09cb..b97c5120c8 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,7 @@
 2002-12-08  Ulrich Drepper  <drepper@redhat.com>
 
+	* pt-fcntl.c (__fcntl): Initialize oldtype to avoid warning.
+
 	* pthreadP.h: Declare __pthread_enable_asynccancel and
 	__pthread_disable_asynccancel.
 	(CANCEL_ASYNC): Use __pthread_enable_asynccancel.
@@ -48,6 +50,8 @@
 	* pt-waitpid.c: Likewise.
 	* pt-write.c: Likewise.
 	* pt-writev.c: Likewise.
+	* pthread_join.c: Likewise.
+	* pthread_timedjoin.c: Likewise.
 
 	* pt-sigpause.c (sigsuspend): Call __sigsuspend.
 	(__xpg_sigpause): New function.
diff --git a/nptl/pt-fcntl.c b/nptl/pt-fcntl.c
index 9d7f68e4c1..5b55f0b920 100644
--- a/nptl/pt-fcntl.c
+++ b/nptl/pt-fcntl.c
@@ -29,7 +29,7 @@
 int
 __fcntl (int fd, int cmd, ...)
 {
-  int oldtype;
+  int oldtype = 0;
   va_list ap;
 
   if (cmd == F_SETLKW)
diff --git a/nptl/pthread_join.c b/nptl/pthread_join.c
index a223a7d4a3..4edbced2c1 100644
--- a/nptl/pthread_join.c
+++ b/nptl/pthread_join.c
@@ -73,8 +73,7 @@ pthread_join (threadid, thread_return)
   pthread_cleanup_push (cleanup, &pd->joinid);
 
   /* Switch to asynchronous cancellation.  */
-  int oldtype;
-  CANCEL_ASYNC (oldtype);
+  int oldtype = CANCEL_ASYNC ();
 
 
   /* Wait for the child.  */
diff --git a/nptl/pthread_timedjoin.c b/nptl/pthread_timedjoin.c
index d3f4a282a6..7725c52229 100644
--- a/nptl/pthread_timedjoin.c
+++ b/nptl/pthread_timedjoin.c
@@ -75,8 +75,7 @@ pthread_timedjoin_np (threadid, thread_return, abstime)
   pthread_cleanup_push (cleanup, &pd->joinid);
 
   /* Switch to asynchronous cancellation.  */
-  int oldtype;
-  CANCEL_ASYNC (oldtype);
+  int oldtype = CANCEL_ASYNC ();
 
 
   /* Wait for the child.  */