]> pilppa.org Git - familiar-h63xx-build.git/blob - org.handhelds.familiar/packages/glib-1.2/glib-1.2-1.2.10/posix-conf-changes
OE tree imported from monotone branch org.openembedded.oz354fam083 at revision 8b12e3...
[familiar-h63xx-build.git] / org.handhelds.familiar / packages / glib-1.2 / glib-1.2-1.2.10 / posix-conf-changes
1
2 #
3 # Patch managed by http://www.holgerschurig.de/patcher.html
4 #
5
6 --- glib-1.2.10/gthread/gthread-posix.c~posix-conf-changes
7 +++ glib-1.2.10/gthread/gthread-posix.c
8 @@ -76,7 +76,7 @@
9    int result;
10  
11    result = pthread_mutex_trylock ((pthread_mutex_t *) mutex);
12 -#ifdef HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX
13 +#ifdef G_THREADS_IMPL_POSIX
14    if (result == EBUSY)
15      return FALSE;
16    posix_check_for_error (result);
17 @@ -127,7 +127,7 @@
18    result = pthread_cond_timedwait ((pthread_cond_t *) cond,
19                                    (pthread_mutex_t *) entered_mutex,
20                                    &end_time);
21 -#ifdef HAVE_PTHREAD_COND_TIMEDWAIT_POSIX
22 +#ifdef G_THREADS_IMPL_POSIX
23    timed_out = (result == ETIMEDOUT);
24  #else
25    timed_out = (result == -1 && errno == EAGAIN);
26 @@ -170,15 +170,15 @@
27  {
28    if (!private_key)
29      return NULL;
30 -#ifdef HAVE_PTHREAD_GETSPECIFIC_POSIX
31 +#ifdef G_THREADS_IMPL_POSIX
32    return pthread_getspecific (*(pthread_key_t *) private_key);
33 -#else /* HAVE_PTHREAD_GETSPECIFIC_POSIX */
34 +#else /* G_THREADS_IMPL_DCE */
35    {
36      void* data;
37      pthread_getspecific (*(pthread_key_t *) private_key, &data);
38      return data;
39    }
40 -#endif /* HAVE_PTHREAD_GETSPECIFIC_POSIX */
41 +#endif /* G_THREADS_IMPL_POSIX*/
42  }
43  
44  static GThreadFunctions g_thread_functions_for_glib_use_default =