diff options
| author | Keith Packard <keithp@keithp.com> | 2013-02-14 11:05:48 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-02-14 11:05:48 -0800 |
| commit | 90642948cc78834d95f7a3bddaac7ff77b68ed7e (patch) | |
| tree | 8164a9b40959f1a8663277eea1ca30cede016815 | |
| parent | 9a35d4240e2aa91ac104f0f9f86f83ff9a2d3d04 (diff) | |
| parent | eda7dbff5a9f35fefe1e3dedacb82daadbf5945e (diff) | |
Merge remote-tracking branch 'jeremyhu/master'
| -rw-r--r-- | hw/xquartz/GL/capabilities.c | 4 | ||||
| -rw-r--r-- | m4/xorg-tls.m4 | 2 | ||||
| -rw-r--r-- | os/strndup.c | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/hw/xquartz/GL/capabilities.c b/hw/xquartz/GL/capabilities.c index 4702595f4..5573629fd 100644 --- a/hw/xquartz/GL/capabilities.c +++ b/hw/xquartz/GL/capabilities.c @@ -20,6 +20,10 @@ * DEALINGS IN THE SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <stdlib.h> #include <assert.h> diff --git a/m4/xorg-tls.m4 b/m4/xorg-tls.m4 index 237fdcd9e..e04f1ff56 100644 --- a/m4/xorg-tls.m4 +++ b/m4/xorg-tls.m4 @@ -28,7 +28,7 @@ AC_DEFUN([XORG_TLS], [ ac_cv_tls=none keywords="__thread __declspec(thread)" for kw in $keywords ; do - AC_TRY_COMPILE([int $kw test;], [], ac_cv_tls=$kw) + AC_TRY_COMPILE([int $kw test;], [], ac_cv_tls=$kw ; break ;) done ]) AC_MSG_RESULT($ac_cv_tls) diff --git a/os/strndup.c b/os/strndup.c index b604b9bac..e0eddf13d 100644 --- a/os/strndup.c +++ b/os/strndup.c @@ -27,6 +27,10 @@ * SUCH DAMAGE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stddef.h> #include <stdlib.h> #include <string.h> |