From 1ebc8da242a1e8dd7707f2bcc51c22d4e1e64990 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 26 Mar 2013 16:07:55 +0000 Subject: 2013-03-26 Sebastian Huber * libc/stdio/local.h (_STDIO_WITH_THREAD_CANCELLATION_SUPPORT): New define. * libc/stdio/fclose.c: Use _STDIO_WITH_THREAD_CANCELLATION_SUPPORT. * libc/stdio/freopen.c: Likewise. * libc/stdio64/freopen64.c: Likewise. --- newlib/libc/stdio/freopen.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'newlib/libc/stdio/freopen.c') diff --git a/newlib/libc/stdio/freopen.c b/newlib/libc/stdio/freopen.c index b33eb1e22..884e56136 100644 --- a/newlib/libc/stdio/freopen.c +++ b/newlib/libc/stdio/freopen.c @@ -102,7 +102,7 @@ _DEFUN(_freopen_r, (ptr, file, mode, fp), /* We can't use the _newlib_flockfile_XXX macros here due to the interlocked locking with the sfp_lock. */ -#if !defined (__SINGLE_THREAD__) && defined (_POSIX_THREADS) +#ifdef _STDIO_WITH_THREAD_CANCELLATION_SUPPORT int __oldcancel; pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &__oldcancel); #endif @@ -111,7 +111,7 @@ _DEFUN(_freopen_r, (ptr, file, mode, fp), if ((flags = __sflags (ptr, mode, &oflags)) == 0) { _funlockfile (fp); -#if !defined (__SINGLE_THREAD__) && defined (_POSIX_THREADS) +#ifdef _STDIO_WITH_THREAD_CANCELLATION_SUPPORT pthread_setcancelstate (__oldcancel, &__oldcancel); #endif _fclose_r (ptr, fp); @@ -222,7 +222,7 @@ _DEFUN(_freopen_r, (ptr, file, mode, fp), __lock_close_recursive (fp->_lock); #endif __sfp_lock_release (); -#if !defined (__SINGLE_THREAD__) && defined (_POSIX_THREADS) +#ifdef _STDIO_WITH_THREAD_CANCELLATION_SUPPORT pthread_setcancelstate (__oldcancel, &__oldcancel); #endif return NULL; @@ -242,7 +242,7 @@ _DEFUN(_freopen_r, (ptr, file, mode, fp), #endif _funlockfile (fp); -#if !defined (__SINGLE_THREAD__) && defined (_POSIX_THREADS) +#ifdef _STDIO_WITH_THREAD_CANCELLATION_SUPPORT pthread_setcancelstate (__oldcancel, &__oldcancel); #endif return fp; -- cgit v1.2.3