diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2005-05-25 12:14:29 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2005-05-25 12:14:29 +0000 |
| commit | 1cb18a4bad565d1f783a4cefb3ed467699051068 (patch) | |
| tree | 56d3657cb45497c1cafd063129e3046b62a27561 | |
| parent | 62343f5162066f19ca6e62d1c85a4a40d45b3295 (diff) | |
Workaround bug in pthread.h
| -rw-r--r-- | hw/xwin/ChangeLog | 6 | ||||
| -rw-r--r-- | hw/xwin/win.h | 4 | ||||
| -rw-r--r-- | hw/xwin/winmultiwindowwm.c | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/hw/xwin/ChangeLog b/hw/xwin/ChangeLog index 4f161e516..478ef8daa 100644 --- a/hw/xwin/ChangeLog +++ b/hw/xwin/ChangeLog @@ -1,3 +1,9 @@ +2005-05-25 Alexander Gottwald <ago at freedesktop dot org> + + * win.h: + * winmultiwindowwm.c: + Workaround bug in pthread.h + 2005-05-08 Alexander Gottwald <ago at freedesktop dot org> * winmultiwindowwndproc.c: diff --git a/hw/xwin/win.h b/hw/xwin/win.h index 8175081e5..eb97a78e9 100644 --- a/hw/xwin/win.h +++ b/hw/xwin/win.h @@ -141,8 +141,10 @@ #include <stdio.h> #include <errno.h> -#if defined(XWIN_MULTIWINDOWEXTWM) || defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW) +#if defined(XWIN_MULTIWINDOWEXTWM) || defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW) +#define HANDLE void * #include <pthread.h> +#undef HANDLE #endif #ifdef HAS_MMAP diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c index 032835397..4fbedd00a 100644 --- a/hw/xwin/winmultiwindowwm.c +++ b/hw/xwin/winmultiwindowwm.c @@ -38,7 +38,9 @@ #endif #include <fcntl.h> #include <setjmp.h> +#define HANDLE void * #include <pthread.h> +#undef HANDLE #include <X11/X.h> #include <X11/Xatom.h> #include <X11/Xlib.h> |