X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fio-layer%2Fhandles-private.h;h=c938f9e4bbb9de64fcd9db711cf891aa6fdd6e68;hb=ca327b1162f17986d5c41c1ac1dd3aec6c89744b;hp=61aa26d77364807a9ee427640a4d128f601a432c;hpb=675328ef1686ce884326df89f8c570943e2d20d2;p=mono.git diff --git a/mono/io-layer/handles-private.h b/mono/io-layer/handles-private.h index 61aa26d7736..c938f9e4bbb 100644 --- a/mono/io-layer/handles-private.h +++ b/mono/io-layer/handles-private.h @@ -13,7 +13,6 @@ #include #include #include -#include #include #include @@ -85,7 +84,7 @@ extern int _wapi_handle_timedwait_signal (struct timespec *timeout, gboolean pol extern int _wapi_handle_wait_signal_handle (gpointer handle, gboolean alertable); extern int _wapi_handle_timedwait_signal_handle (gpointer handle, struct timespec *timeout, gboolean alertable, gboolean poll); -extern gboolean _wapi_handle_get_or_set_share (dev_t device, ino_t inode, +extern gboolean _wapi_handle_get_or_set_share (guint64 device, guint64 inode, guint32 new_sharemode, guint32 new_access, guint32 *old_sharemode, @@ -145,7 +144,6 @@ static inline void _wapi_handle_set_signal_state (gpointer handle, /* The condition the global signal cond is waiting on is the signalling of * _any_ handle. So lock it before setting the signalled state. */ - pthread_cleanup_push ((void(*)(void *))mono_mutex_unlock_in_cleanup, (void *)_wapi_global_signal_mutex); thr_ret = mono_mutex_lock (_wapi_global_signal_mutex); if (thr_ret != 0) g_warning ("Bad call to mono_mutex_lock result %d for global signal mutex", thr_ret); @@ -180,8 +178,6 @@ static inline void _wapi_handle_set_signal_state (gpointer handle, if (thr_ret != 0) g_warning ("Bad call to mono_mutex_unlock result %d for global signal mutex", thr_ret); g_assert (thr_ret == 0); - - pthread_cleanup_pop (0); } else { handle_data->signalled=state; }