frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'jeremyhu/master'

This commit is contained in:
Keith Packard 2013-02-14 11:05:48 -08:00
parent 9a35d4240e eda7dbff5a
commit 90642948cc
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xquartz/GL/capabilities.c
View File

@ -20,6 +20,10 @@
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
*/ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>

2
m4/xorg-tls.m4
View File

@ -28,7 +28,7 @@ AC_DEFUN([XORG_TLS], [
ac_cv_tls=none ac_cv_tls=none
keywords="__thread __declspec(thread)" keywords="__thread __declspec(thread)"
for kw in $keywords ; do 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 done
]) ])
AC_MSG_RESULT($ac_cv_tls) AC_MSG_RESULT($ac_cv_tls)

4
os/strndup.c
View File

@ -27,6 +27,10 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>