Define _IO_cleanup_region_start_noarg.

diff --git a/bits/stdio-lock.h b/bits/stdio-lock.h
index 5e9f819..225ccd8 100644 (file)
--- a/bits/stdio-lock.h
+++ b/bits/stdio-lock.h
@@ -1,5 +1,5 @@
 /* Thread package specific definitions of stream lock type.  Stub version.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001 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
@@ -31,6 +31,8 @@ __libc_lock_define (typedef, _IO_lock_t)
 
 #define _IO_cleanup_region_start(_fct, _fp) \
      __libc_cleanup_region_start (_fct, _fp)
+#define _IO_cleanup_region_start_noarg(_fct) \
+     __libc_cleanup_region_start (_fct, NULL)
 #define _IO_cleanup_region_end(_doit) \
      __libc_cleanup_region_end (_doit)
 #define _IO_lock_init(_name) \

diff --git a/linuxthreads/sysdeps/pthread/bits/stdio-lock.h b/linuxthreads/sysdeps/pthread/bits/stdio-lock.h
index 42c2196..a1893c8 100644 (file)
--- a/linuxthreads/sysdeps/pthread/bits/stdio-lock.h
+++ b/linuxthreads/sysdeps/pthread/bits/stdio-lock.h
@@ -1,5 +1,5 @@
 /* Thread package specific definitions of stream lock type.
-   Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 2000, 2001 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
@@ -32,6 +32,12 @@ typedef pthread_mutex_t _IO_lock_t;
     if (_avail) {                                                            \
       _pthread_cleanup_push_defer (&_buffer, (_fct), (_fp));                 \
     }
+#define _IO_cleanup_region_start_noarg(_fct) \
+  { struct _pthread_cleanup_buffer _buffer;                                  \
+    int _avail = _pthread_cleanup_push_defer != NULL;                        \
+    if (_avail) {                                                            \
+      _pthread_cleanup_push_defer (&_buffer, (_fct), NULL);                  \
+    }
 #define _IO_cleanup_region_end(_doit) \
      __libc_cleanup_region_end (_doit)
 #define _IO_lock_init(_name) \

diff --git a/sysdeps/generic/bits/stdio-lock.h b/sysdeps/generic/bits/stdio-lock.h
index 5e9f819..225ccd8 100644 (file)
--- a/sysdeps/generic/bits/stdio-lock.h
+++ b/sysdeps/generic/bits/stdio-lock.h
@@ -1,5 +1,5 @@
 /* Thread package specific definitions of stream lock type.  Stub version.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001 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
@@ -31,6 +31,8 @@ __libc_lock_define (typedef, _IO_lock_t)
 
 #define _IO_cleanup_region_start(_fct, _fp) \
      __libc_cleanup_region_start (_fct, _fp)
+#define _IO_cleanup_region_start_noarg(_fct) \
+     __libc_cleanup_region_start (_fct, NULL)
 #define _IO_cleanup_region_end(_doit) \
      __libc_cleanup_region_end (_doit)
 #define _IO_lock_init(_name) \

diff --git a/sysdeps/mach/hurd/bits/stdio-lock.h b/sysdeps/mach/hurd/bits/stdio-lock.h
index 85f6d05..e2b3957 100644 (file)
--- a/sysdeps/mach/hurd/bits/stdio-lock.h
+++ b/sysdeps/mach/hurd/bits/stdio-lock.h
@@ -1,5 +1,5 @@
 /* Thread package specific definitions of stream lock type.  Hurd version.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001 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
@@ -55,6 +55,8 @@ typedef struct _IO_cthreads_lock _IO_lock_t;
 
 #define _IO_cleanup_region_start(_fct, _fp) \
      __libc_cleanup_region_start (_fct, _fp)
+#define _IO_cleanup_region_start_noarg(_fct) \
+     __libc_cleanup_region_start (_fct, NULL)
 #define _IO_cleanup_region_end(_doit) \
      __libc_cleanup_region_end (_doit)
 #endif